Change matrix generator -- now it could generate zero matrices

Author: dpanfilyonok

tests/GraphBLAS-sharp.Tests/Common.fs

@@ -33,28 +33,15 @@ module Generators =
             Gen.choose (1, size |> float |> sqrt |> int)
             |> Gen.three
 
-    // non-empty and nonzeroes exists
-    let pairOfSparseMatricesGenerator (valuesGenerator: Gen<'a>) (zero: 'a) (isZero: 'a -> bool) =
-        Gen.sized <| fun size ->
-            let sparseGenerator =
-                Gen.oneof [
-                    valuesGenerator
-                    Gen.constant zero
-                ]
-
-            gen {
-                // let! (rowsA, colsA, colsB) = dimension3DGenerator
-                let! (nrows, ncols) = dimension2DGenerator
-                let! matrixA = sparseGenerator |> Gen.array2DOfDim (nrows, ncols)
-                let! matrixB = sparseGenerator |> Gen.array2DOfDim (nrows, ncols)
-                return (matrixA, matrixB)
-            }
-            |> Gen.filter (fun (matrixA, matrixB) -> matrixA.Length <> 0 && matrixB.Length <> 0)
-            |> Gen.filter
-                (fun (matrixA, matrixB) ->
-                    matrixA |> Seq.cast<'a> |> Seq.exists (not << isZero) &&
-                    matrixB |> Seq.cast<'a> |> Seq.exists (not << isZero)
-                )
+    // generate non-empty matrices
+    let pairOfMatricesOfEqualSizeGenerator (valuesGenerator: Gen<'a>) =
+        gen {
+            let! (nrows, ncols) = dimension2DGenerator
+            let! matrixA = valuesGenerator |> Gen.array2DOfDim (nrows, ncols)
+            let! matrixB = valuesGenerator |> Gen.array2DOfDim (nrows, ncols)
+            return (matrixA, matrixB)
+        }
+        |> Gen.filter (fun (matrixA, matrixB) -> matrixA.Length <> 0 && matrixB.Length <> 0)
 
 module Utils =
     let rec cartesian listOfLists =

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

@@ -38,24 +38,30 @@ let testCases =
             }
         )
 
-type PairOfSparseMatrices =
+type PairOfSparseMatricesOfEqualSize =
     static member IntType() =
-        Arb.fromGen <| Generators.pairOfSparseMatricesGenerator
-            Arb.generate<int>
-            0
-            ((=) 0)
+        Generators.pairOfMatricesOfEqualSizeGenerator (
+            Gen.oneof [
+                Arb.generate<int>
+                Gen.constant 0
+            ]
+        ) |> Arb.fromGen
 
     static member FloatType() =
-        Arb.fromGen <| Generators.pairOfSparseMatricesGenerator
-            (Arb.Default.NormalFloat() |> Arb.toGen |> Gen.map float)
-            0.
-            (fun x -> abs x < Accuracy.medium.absolute)
+        Generators.pairOfMatricesOfEqualSizeGenerator (
+            Gen.oneof [
+                (Arb.Default.NormalFloat() |> Arb.toGen |> Gen.map float)
+                Gen.constant 0.
+            ]
+        ) |> Arb.fromGen
 
     static member BoolType() =
-        Arb.fromGen <| Generators.pairOfSparseMatricesGenerator
-            Arb.generate<bool>
-            false
-            ((=) false)
+        Generators.pairOfMatricesOfEqualSizeGenerator (
+            Gen.oneof [
+                Arb.generate<bool>
+                Gen.constant false
+            ]
+        ) |> Arb.fromGen
 
 let createMatrix<'a when 'a : struct and 'a : equality> matrixFormat args =
     match matrixFormat with
@@ -163,7 +169,7 @@ let checkCorrectnessGeneric<'a when 'a : struct and 'a : equality>
 
 let config = {
     FsCheckConfig.defaultConfig with
-        arbitrary = [typeof<PairOfSparseMatrices>]
+        arbitrary = [typeof<PairOfSparseMatricesOfEqualSize>]
         startSize = 0
         maxTest = 10
 }