add: (vector, mask, value) generator

Author: IgorErin

benchmarks/GraphBLAS-sharp.Benchmarks/Helpers.fs

@@ -14,6 +14,7 @@ open BenchmarkDotNet.Jobs
 open GraphBLAS.FSharp.Tests
 open FsCheck
 open Expecto
+open GraphBLAS.FSharp.Test
 
 type CommonConfig() =
     inherit ManualConfig()
@@ -258,7 +259,7 @@ module Utils =
 module VectorGenerator =
     let private pairOfVectorsOfEqualSize (valuesGenerator: Gen<'a>) createVector =
         gen {
-            let! length = Gen.sized <| fun size -> Gen.constant size
+            let! length = Gen.sized <| Gen.constant
 
             let! leftArray = Gen.arrayOfLength length valuesGenerator
 

tests/GraphBLAS-sharp.Tests/Generators.fs

@@ -758,3 +758,62 @@ module Generators =
         static member BoolType() =
             pairOfVectorsOfEqualSize <| Arb.generate<bool>
             |> Arb.fromGen
+
+    type PairOfArraysAndValue() =
+        static let pairOfVectorsOfEqualSize (valuesGenerator: Gen<'a>) =
+            gen {
+                let! length = Gen.sized <| fun size -> Gen.choose (1, size)
+
+                let! leftArray = Gen.arrayOfLength length valuesGenerator
+
+                let! rightArray = Gen.arrayOfLength length valuesGenerator
+
+                let value =
+                    List.last <| Gen.sample 100 1 valuesGenerator
+
+                return (leftArray, rightArray, value)
+            }
+
+        static member IntType() =
+            pairOfVectorsOfEqualSize <| Arb.generate<int>
+            |> Arb.fromGen
+
+        static member FloatType() =
+            pairOfVectorsOfEqualSize
+            <| (Arb.Default.NormalFloat()
+                |> Arb.toGen
+                |> Gen.map float)
+            |> Arb.fromGen
+
+        static member Float32Type() =
+            pairOfVectorsOfEqualSize
+            <| (normalFloat32Generator <| System.Random())
+            |> Arb.fromGen
+
+        static member SByteType() =
+            pairOfVectorsOfEqualSize <| Arb.generate<sbyte>
+            |> Arb.fromGen
+
+        static member ByteType() =
+            pairOfVectorsOfEqualSize <| Arb.generate<byte>
+            |> Arb.fromGen
+
+        static member Int16Type() =
+            pairOfVectorsOfEqualSize <| Arb.generate<int16>
+            |> Arb.fromGen
+
+        static member UInt16Type() =
+            pairOfVectorsOfEqualSize <| Arb.generate<uint16>
+            |> Arb.fromGen
+
+        static member Int32Type() =
+            pairOfVectorsOfEqualSize <| Arb.generate<int32>
+            |> Arb.fromGen
+
+        static member UInt32Type() =
+            pairOfVectorsOfEqualSize <| Arb.generate<uint32>
+            |> Arb.fromGen
+
+        static member BoolType() =
+            pairOfVectorsOfEqualSize <| Arb.generate<bool>
+            |> Arb.fromGen

tests/GraphBLAS-sharp.Tests/Helpers.fs

@@ -28,7 +28,8 @@ module Utils =
                     typeof<Generators.ArrayOfDistinctKeys>
                     typeof<Generators.ArrayOfAscendingKeys>
                     typeof<Generators.BufferCompatibleArray>
-                    typeof<Generators.PairOfVectorsOfEqualSize> ] }
+                    typeof<Generators.PairOfVectorsOfEqualSize>
+                    typeof<Generators.PairOfArraysAndValue> ] }
 
     let floatIsEqual x y =
         abs (x - y) < Accuracy.medium.absolute

tests/GraphBLAS-sharp.Tests/Matrix/Mxm.fs

@@ -9,6 +9,7 @@ open GraphBLAS.FSharp.Objects
 open GraphBLAS.FSharp.Backend.Matrix
 open GraphBLAS.FSharp.Backend.Objects
 open GraphBLAS.FSharp.Objects.MatrixExtensions
+open GraphBLAS.FSharp.Test
 
 let logger = Log.create "Mxm.Tests"
 
@@ -60,8 +61,7 @@ let makeTest context q zero isEqual plus mul mxmFun (leftMatrix: 'a [,], rightMa
             |> Expect.equal actual expected
 
 let tests =
-
-    let getCorrectnessTestName datatype = sprintf "Correctness on %s" datatype
+    let getCorrectnessTestName = sprintf "Correctness on %s"
 
     let config =
         { Utils.defaultConfig with

tests/GraphBLAS-sharp.Tests/Vector/AssignByMask.fs

@@ -55,8 +55,7 @@ let makeTest<'a when 'a: struct and 'a: equality>
     (fillVector: MailboxProcessor<Msg> -> AllocationFlag -> ClVector<'a> -> ClVector<'a> -> ClCell<'a> -> ClVector<'a>)
     isComplemented
     case
-    (vector: 'a [], mask: 'a [])
-    (value: 'a)
+    (vector: 'a [], mask: 'a [], value: 'a)
     =
 
     let leftVector =

tests/GraphBLAS-sharp.Tests/Vector/Reduce.fs

@@ -89,7 +89,7 @@ let testFixtures case =
       createTest<float32> case Utils.float32IsEqual System.Single.MaxValue min <@ min @> "min"
       createTest<byte> case (=) System.Byte.MaxValue min <@ min @> "min"
       createTest<bool> case (=) false (||) <@ (||) @> "add"
-      createTest<bool> case (=) true (&&) <@ (&&) @> "multiply"]
+      createTest<bool> case (=) true (&&) <@ (&&) @> "multiply" ]
 
 let tests =
     operationGPUTests "Reduce tests" testFixtures