Add the MRI code as it is after its first successful output.

[spline3.git] / src / Values.hs

diff --git a/src/Values.hs b/src/Values.hs
index dab9e3487e0a6862c73035be7df0fed1235cbe18..070abbbf2554ea5eec5276e5496fe1554fcaf3d3 100644 (file)
--- a/src/Values.hs
+++ b/src/Values.hs
@@ -12,7 +12,7 @@ import Data.Array.Repa (
   DIM3,
   extent,
   fromList,
-  index,
+  unsafeIndex,
   reshape,
   size
   )
@@ -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
@@ -71,7 +72,7 @@ dims v3d =
 
 idx :: Values3D -> Int -> Int -> Int -> Double
 idx v3d i j k =
-    index v3d shape
+    unsafeIndex v3d shape
     where
       shape :: DIM3
       shape = (Z :. i :. j :. k)