Change predefined monoid and semiring names

Author: dpanfilyonok

src/GraphBLAS-sharp/Algorithms/BFS.fs

@@ -8,7 +8,7 @@ open GraphBLAS.FSharp
 module BFS =
     let levelBFS (matrix: Matrix<bool>) (source: int) : Vector<int> =
         let vertexCount = matrix.RowCount
-        let levels = DenseVector(Array.zeroCreate vertexCount, IntegerMonoid.plus)
+        let levels = DenseVector(Array.zeroCreate vertexCount, IntegerMonoid.add)
 
         let frontier = SparseVector(vertexCount, [source, true])
 

src/GraphBLAS-sharp/Algorithms/SSSP.fs

@@ -10,6 +10,6 @@ module SSSP =
         let distance = SparseVector(vertexCount, [source, 0.])
 
         for _ in 1 .. vertexCount - 1 do
-            distance.[Mask1D.none] <- (distance .@ matrix) Mask1D.none FloatSemiring.minPlus
+            distance.[Mask1D.none] <- (distance .@ matrix) Mask1D.none FloatSemiring.addMult
 
         upcast distance

src/GraphBLAS-sharp/GraphBLAS-sharp.fsproj

@@ -21,11 +21,11 @@
     <Compile Include="Vector.fs" />
     <Compile Include="Masks.fs" />
     <Compile Include="Predefined/Float.fs" />
-    <Compile Include="Predefined/Boolean.fs" />
     <Compile Include="Predefined/Integer.fs" />
+    <Compile Include="Predefined/Boolean.fs" />
     <Compile Include="Algorithms/BFS.fs" />
     <Compile Include="Algorithms/SSSP.fs" />
     <Compile Include="Algorithms/TriangleCounting.fs" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>

src/GraphBLAS-sharp/Predefined/Float.fs

@@ -3,7 +3,7 @@ namespace GraphBLAS.FSharp.Predefined
 open GraphBLAS.FSharp
 
 module FloatMonoid =
-    let plus: Monoid<float> = {
+    let add: Monoid<float> = {
         Zero = 0.
         Append = BinaryOp <@ ( + ) @>
     }
@@ -14,12 +14,12 @@ module FloatMonoid =
     }
 
 module FloatSemiring =
-    let plusTimes: Semiring<float> = {
-        PlusMonoid = FloatMonoid.plus
+    let addMult: Semiring<float> = {
+        PlusMonoid = FloatMonoid.add
         Times = BinaryOp <@ ( * ) @>
     }
 
-    let minPlus: Semiring<float> = {
+    let minAdd: Semiring<float> = {
         PlusMonoid = FloatMonoid.min
         Times = BinaryOp <@ ( + ) @>
     }

src/GraphBLAS-sharp/Predefined/Integer.fs

@@ -3,7 +3,7 @@ namespace GraphBLAS.FSharp.Predefined
 open GraphBLAS.FSharp
 
 module IntegerMonoid =
-    let plus: Monoid<int> = {
+    let add: Monoid<int> = {
         Zero = 0
         Append = BinaryOp <@ ( + ) @>
     }

tests/GraphBLAS-sharp.Tests/OperationsTests/VxmTests.fs

@@ -88,10 +88,10 @@ module VxmTests =
                         // тут просто размерности генерить и создавать пустые объекты
                         fun m n k ->
                             let emptyMatrix = Matrix.ZeroCreate(m, n, matrixBackend)
-                            let emptyVector = Vector.Dense(Predefined.FloatMonoid.plus)
+                            let emptyVector = Vector.Dense(Predefined.FloatMonoid.add)
 
                             Expect.throwsT
-                                (fun () -> (emptyVector .@ emptyMatrix) Mask1D.none Predefined.FloatSemiring.plusTimes |> ignore)
+                                (fun () -> (emptyVector .@ emptyMatrix) Mask1D.none Predefined.FloatSemiring.addMult |> ignore)
                                 (sprintf "Argument has invalid dimension. Need %i, but given %i" k m )
 
                     testPropertyWithConfig config "Operation should have correct semantic" <|