X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FValues.hs;h=8e2b61e789e9cb4fc86fc4921055e1021c5cecc3;hb=8c9954ffb0d636ee383e00242a1c8214d28f8461;hp=dab9e3487e0a6862c73035be7df0fed1235cbe18;hpb=6b331ce746d10e9fe180b7c8ecc75988b24da535;p=spline3.git diff --git a/src/Values.hs b/src/Values.hs index dab9e34..8e2b61e 100644 --- a/src/Values.hs +++ b/src/Values.hs @@ -20,7 +20,7 @@ import Data.Array.Repa ( import Data.Array.Repa.IO.Vector (readVectorFromTextFile, writeVectorToTextFile) import System.FilePath () -import Test.QuickCheck (Arbitrary(..), Gen, Positive(..), vectorOf) +import Test.QuickCheck (Arbitrary(..), Gen, choose, vectorOf) import ScaleFactor @@ -33,9 +33,10 @@ type Values3D = Array DIM3 Double instance Arbitrary Values3D where arbitrary = do - (Positive x_dim) <- arbitrary :: Gen (Positive Int) - (Positive y_dim) <- arbitrary :: Gen (Positive Int) - (Positive z_dim) <- arbitrary :: Gen (Positive Int) + -- I declare not to care about empty lists. + x_dim <- choose (1, 27) + y_dim <- choose (1, 27) + z_dim <- choose (1, 27) elements <- vectorOf (x_dim * y_dim * z_dim) (arbitrary :: Gen Double) let new_shape = (Z :. x_dim :. y_dim :. z_dim) let three_d = Data.Array.Repa.fromList new_shape elements