Change semiring parameters count from 3 to 1

Author: dpanfilyonok

src/GraphBLAS-sharp/Abstracts.fs

@@ -18,20 +18,20 @@ type Matrix<'a when 'a : struct and 'a : equality>(nrow: int, ncol: int) =
     abstract Fill: Mask1D option * int -> Scalar<'a> with set
     abstract Fill: int * Mask1D option -> Scalar<'a> with set
 
-    abstract Mxm: Matrix<'b> -> Mask2D option -> Semiring<'a, 'b, 'c> -> Matrix<'c>
-    abstract Mxv: Vector<'b> -> Mask1D option -> Semiring<'a, 'b, 'c> -> Vector<'c>
-    abstract EWiseAdd: Matrix<'b> -> Mask2D option -> Semiring<'a, 'b, 'c> -> Matrix<'c>
-    abstract EWiseMult: Matrix<'b> -> Mask2D option -> Semiring<'a, 'b, 'c> -> Matrix<'c>
+    abstract Mxm: Matrix<'a> -> Mask2D option -> Semiring<'a> -> Matrix<'a>
+    abstract Mxv: Vector<'a> -> Mask1D option -> Semiring<'a> -> Vector<'a>
+    abstract EWiseAdd: Matrix<'a> -> Mask2D option -> Monoid<'a> -> Matrix<'a>
+    abstract EWiseMult: Matrix<'a> -> Mask2D option -> Monoid<'a> -> Matrix<'a>
     abstract Apply: Mask1D option -> UnaryOp<'a, 'b> -> Matrix<'b>
     abstract ReduceIn: Mask1D option -> Monoid<'a> -> Vector<'a>
     abstract ReduceOut: Mask1D option -> Monoid<'a> -> Vector<'a>
     abstract Reduce: Monoid<'a> -> Scalar<'a>
     abstract T: Matrix<'a>
 
-    static member inline (+) (x: Matrix<'a>, y: Matrix<'b>) = x.EWiseAdd y
-    static member inline (*) (x: Matrix<'a>, y: Matrix<'b>) = x.EWiseMult y
-    static member inline (@.) (x: Matrix<'a>, y: Matrix<'b>) = x.Mxm y
-    static member inline (@.) (x: Matrix<'a>, y: Vector<'b>) = x.Mxv y
+    static member inline (+) (x: Matrix<'a>, y: Matrix<'a>) = x.EWiseAdd y
+    static member inline (*) (x: Matrix<'a>, y: Matrix<'a>) = x.EWiseMult y
+    static member inline (@.) (x: Matrix<'a>, y: Matrix<'a>) = x.Mxm y
+    static member inline (@.) (x: Matrix<'a>, y: Vector<'a>) = x.Mxv y
 
 and [<AbstractClass>] Vector<'a when 'a : struct and 'a : equality>(length: int) =
     abstract Length: int
@@ -47,15 +47,15 @@ and [<AbstractClass>] Vector<'a when 'a : struct and 'a : equality>(length: int)
     abstract Item: int -> Scalar<'a> with get, set
     abstract Fill: Mask1D option -> Scalar<'a> with set
 
-    abstract Vxm: Matrix<'b> -> Mask1D option -> Semiring<'a, 'b, 'c> -> Vector<'c>
-    abstract EWiseAdd: Vector<'b> -> Mask1D option -> Semiring<'a, 'b, 'c> -> Vector<'c>
-    abstract EWiseMult: Vector<'b> -> Mask1D option -> Semiring<'a, 'b, 'c> -> Vector<'c>
+    abstract Vxm: Matrix<'a> -> Mask1D option -> Semiring<'a> -> Vector<'a>
+    abstract EWiseAdd: Vector<'a> -> Mask1D option -> Monoid<'a> -> Vector<'a>
+    abstract EWiseMult: Vector<'a> -> Mask1D option -> Monoid<'a> -> Vector<'a>
     abstract Apply: Mask1D option -> UnaryOp<'a, 'b> -> Vector<'b>
     abstract Reduce: Monoid<'a> -> Scalar<'a>
 
-    static member inline (+) (x: Vector<'a>, y: Vector<'b>) = x.EWiseAdd y
-    static member inline (*) (x: Vector<'a>, y: Vector<'b>) = x.EWiseMult y
-    static member inline (@.) (x: Vector<'a>, y: Matrix<'b>) = x.Vxm y
+    static member inline (+) (x: Vector<'a>, y: Vector<'a>) = x.EWiseAdd y
+    static member inline (*) (x: Vector<'a>, y: Vector<'a>) = x.EWiseMult y
+    static member inline (@.) (x: Vector<'a>, y: Matrix<'a>) = x.Vxm y
 
 and Mask1D(indices: int[], length: int, isComplemented: bool) =
     member this.Indices = indices

src/GraphBLAS-sharp/Implementations.fs

@@ -132,7 +132,7 @@ and SparseVector<'a when 'a : struct and 'a : equality>(size: int, listOfNonzero
     override this.Fill
         with set (mask: Mask1D option) (value: Scalar<'a>) = failwith "Not Implemented"
 
-    override this.Vxm (matrix: Matrix<'b>) (mask: Mask1D option) (semiring: Semiring<'a, 'b, 'c>) : Vector<'c> = failwith "Not Implemented"
+    override this.Vxm (matrix: Matrix<'a>) (mask: Mask1D option) (semiring: Semiring<'a>) : Vector<'a> = failwith "Not Implemented"
     override this.EWiseAdd a b c = failwith "Not Implemented"
     override this.EWiseMult a b c = failwith "Not Implemented"
     override this.Apply a b = failwith "Not Implemented"

src/GraphBLAS-sharp/Predefined/Integer.fs

@@ -19,7 +19,7 @@ module IntegerSemiring =
         Times = BinaryOp <@ ( * ) @>
     }
 
-    let minFirst<'b> : Semiring<int, 'b, int> = {
-        PlusMonoid = IntegerMonoid.min
-        Times = BinaryOp <@ fun x y -> x @>
-    }
+    // let minFirst<'b> : Semiring<int, 'b, int> = {
+    //     PlusMonoid = IntegerMonoid.min
+    //     Times = BinaryOp <@ fun x y -> x @>
+    // }

src/GraphBLAS-sharp/Semiring.fs

@@ -1,8 +1,6 @@
 namespace GraphBLAS.FSharp
 
-type Semiring<'T1, 'T2, 'TOut> = {
-    PlusMonoid: Monoid<'TOut>
-    Times: BinaryOp<'T1, 'T2, 'TOut>
+type Semiring<'T> = {
+    PlusMonoid: Monoid<'T>
+    Times: BinaryOp<'T, 'T, 'T>
 }
-
-type Semiring<'T> = Semiring<'T, 'T, 'T>