Changed mask to option of mask in method arguments

Author: artemgl

src/GraphBLAS-sharp/CSRMatrix.fs

@@ -84,23 +84,23 @@ type CSRMatrix<'a when 'a : struct and 'a : equality>(csrTuples: CSRFormat<'a>)
     override this.Complemented = failwith "Not implemented"
 
     override this.Item
-        with get (mask: Mask2D) : Matrix<'a> = failwith "Not Implemented"
-        and set (mask: Mask2D) (value: Matrix<'a>) = failwith "Not Implemented"
+        with get (mask: Mask2D option) : Matrix<'a> = failwith "Not Implemented"
+        and set (mask: Mask2D option) (value: Matrix<'a>) = failwith "Not Implemented"
     override this.Item
-        with get (vectorMask: Mask1D, colIdx: int) : Vector<'a> = failwith "Not Implemented"
-        and set (vectorMask: Mask1D, colIdx: int) (value: Vector<'a>) = failwith "Not Implemented"
+        with get (vectorMask: Mask1D option, colIdx: int) : Vector<'a> = failwith "Not Implemented"
+        and set (vectorMask: Mask1D option, colIdx: int) (value: Vector<'a>) = failwith "Not Implemented"
     override this.Item
-        with get (rowIdx: int, vectorMask: Mask1D) : Vector<'a> = failwith "Not Implemented"
-        and set (rowIdx: int, vectorMask: Mask1D) (value: Vector<'a>) = failwith "Not Implemented"
+        with get (rowIdx: int, vectorMask: Mask1D option) : Vector<'a> = failwith "Not Implemented"
+        and set (rowIdx: int, vectorMask: Mask1D option) (value: Vector<'a>) = failwith "Not Implemented"
     override this.Item
         with get (rowIdx: int, colIdx: int) : Scalar<'a> = failwith "Not Implemented"
         and set (rowIdx: int, colIdx: int) (value: Scalar<'a>) = failwith "Not Implemented"
     override this.Item
-        with set (mask: Mask2D) (value: Scalar<'a>) = failwith "Not Implemented"
+        with set (mask: Mask2D option) (value: Scalar<'a>) = failwith "Not Implemented"
     override this.Item
-        with set (vectorMask: Mask1D, colIdx: int) (value: Scalar<'a>) = failwith "Not Implemented"
+        with set (vectorMask: Mask1D option, colIdx: int) (value: Scalar<'a>) = failwith "Not Implemented"
     override this.Item
-        with set (rowIdx: int, vectorMask: Mask1D) (value: Scalar<'a>) = failwith "Not Implemented"
+        with set (rowIdx: int, vectorMask: Mask1D option) (value: Scalar<'a>) = failwith "Not Implemented"
 
     override this.Mxm a b c = failwith "Not Implemented"
     override this.Mxv a b c = failwith "Not Implemented"

src/GraphBLAS-sharp/DenseVector.fs

@@ -25,13 +25,13 @@ type DenseVector<'a when 'a : struct and 'a : equality>(vector: 'a[], monoid: Mo
         Some <| Mask1D(indices, this.Length, true)
 
     override this.Item
-        with get (mask: Mask1D) : Vector<'a> = failwith "Not Implemented"
-        and set (mask: Mask1D) (value: Vector<'a>) = failwith "Not Implemented"
+        with get (mask: Mask1D option) : Vector<'a> = failwith "Not Implemented"
+        and set (mask: Mask1D option) (value: Vector<'a>) = failwith "Not Implemented"
     override this.Item
         with get (idx: int) : Scalar<'a> = failwith "Not Implemented"
         and set (idx: int) (value: Scalar<'a>) = failwith "Not Implemented"
     override this.Item
-        with set (mask: Mask1D) (value: Scalar<'a>) = failwith "Not Implemented"
+        with set (mask: Mask1D option) (value: Scalar<'a>) = failwith "Not Implemented"
 
     override this.Vxm a b c = failwith "Not Implemented"
     override this.EWiseAdd a b c = failwith "Not Implemented"

src/GraphBLAS-sharp/MatrixAndVector.fs

@@ -5,29 +5,29 @@ type Matrix<'a when 'a : struct and 'a : equality>() =
     abstract RowCount: int
     abstract ColumnCount: int
 
-    abstract Mask: Option<Mask2D>
-    abstract Complemented: Option<Mask2D>
+    abstract Mask: Mask2D option
+    abstract Complemented: Mask2D option
 
-    abstract Item: Mask2D -> Matrix<'a> with get, set
-    abstract Item: Mask1D * int -> Vector<'a> with get, set
-    abstract Item: int * Mask1D -> Vector<'a> with get, set
+    abstract Item: Mask2D option -> Matrix<'a> with get, set
+    abstract Item: Mask1D option * int -> Vector<'a> with get, set
+    abstract Item: int * Mask1D option -> Vector<'a> with get, set
     abstract Item: int * int -> Scalar<'a> with get, set
-    abstract Item: Mask2D -> Scalar<'a> with set
-    abstract Item: Mask1D * int -> Scalar<'a> with set
-    abstract Item: int * Mask1D -> Scalar<'a> with set
-
-    abstract Mxm: Matrix<'a> -> Mask2D -> Semiring<'a> -> Matrix<'a>
-    abstract Mxv: Vector<'a> -> Mask1D -> Semiring<'a> -> Vector<'a>
-    abstract EWiseAdd: Matrix<'a> -> Mask2D -> Semiring<'a> -> Matrix<'a>
-    abstract EWiseMult: Matrix<'a> -> Mask2D -> Semiring<'a> -> Matrix<'a>
-    abstract Apply: Mask1D -> UnaryOp<'a, 'b> -> Matrix<'b>
-    abstract ReduceIn: Mask1D -> Monoid<'a> -> Vector<'a>
-    abstract ReduceOut: Mask1D -> Monoid<'a> -> Vector<'a>
+    abstract Item: Mask2D option -> Scalar<'a> with set
+    abstract Item: Mask1D option * int -> Scalar<'a> with set
+    abstract Item: int * Mask1D option -> Scalar<'a> with set
+
+    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 -> Semiring<'a> -> Matrix<'a>
+    abstract EWiseMult: Matrix<'a> -> Mask2D option -> Semiring<'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 T: Matrix<'a>
 
-    abstract EWiseAddInplace: Matrix<'a> -> Mask2D -> Semiring<'a> -> unit
-    abstract EWiseMultInplace: Matrix<'a> -> Mask2D -> Semiring<'a> -> unit
-    abstract ApplyInplace: Mask2D -> UnaryOp<'a, 'b> -> unit
+    abstract EWiseAddInplace: Matrix<'a> -> Mask2D option -> Semiring<'a> -> unit
+    abstract EWiseMultInplace: Matrix<'a> -> Mask2D option -> Semiring<'a> -> unit
+    abstract ApplyInplace: Mask2D option -> UnaryOp<'a, 'b> -> unit
 
     static member inline (+) (x: Matrix<'a>, y: Matrix<'a>) = x.EWiseAdd y
     static member inline (*) (x: Matrix<'a>, y: Matrix<'a>) = x.EWiseMult y
@@ -40,22 +40,22 @@ and [<AbstractClass>] Vector<'a when 'a : struct and 'a : equality>() =
     abstract Length: int
     abstract AsArray: 'a[]
 
-    abstract Mask: Option<Mask1D>
-    abstract Complemented: Option<Mask1D>
+    abstract Mask: Mask1D option
+    abstract Complemented: Mask1D option
 
-    abstract Item: Mask1D -> Vector<'a> with get, set
+    abstract Item: Mask1D option -> Vector<'a> with get, set
     abstract Item: int -> Scalar<'a> with get, set
-    abstract Item: Mask1D -> Scalar<'a> with set
+    abstract Item: Mask1D option -> Scalar<'a> with set
 
-    abstract Vxm: Matrix<'a> -> Mask1D -> Semiring<'a> -> Vector<'a>
-    abstract EWiseAdd: Vector<'a> -> Mask1D -> Semiring<'a> -> Vector<'a>
-    abstract EWiseMult: Vector<'a> -> Mask1D -> Semiring<'a> -> Vector<'a>
-    abstract Apply: Mask1D -> UnaryOp<'a, 'b> -> Vector<'b>
+    abstract Vxm: Matrix<'a> -> Mask1D option -> Semiring<'a> -> Vector<'a>
+    abstract EWiseAdd: Vector<'a> -> Mask1D option -> Semiring<'a> -> Vector<'a>
+    abstract EWiseMult: Vector<'a> -> Mask1D option -> Semiring<'a> -> Vector<'a>
+    abstract Apply: Mask1D option -> UnaryOp<'a, 'b> -> Vector<'b>
     abstract Reduce: Monoid<'a> -> Scalar<'a>
 
-    abstract EWiseAddInplace: Vector<'a> -> Mask1D -> Semiring<'a> -> unit
-    abstract EWiseMultInplace: Vector<'a> -> Mask1D -> Semiring<'a> -> unit
-    abstract ApplyInplace: Mask1D -> UnaryOp<'a, 'b> -> unit
+    abstract EWiseAddInplace: Vector<'a> -> Mask1D option -> Semiring<'a> -> unit
+    abstract EWiseMultInplace: Vector<'a> -> Mask1D option -> Semiring<'a> -> unit
+    abstract ApplyInplace: Mask1D option -> UnaryOp<'a, 'b> -> unit
 
     static member inline (+) (x: Vector<'a>, y: Vector<'a>) = x.EWiseAdd y
     static member inline (*) (x: Vector<'a>, y: Vector<'a>) = x.EWiseMult y