X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FValues.hs;h=d7ede8399391b3229a1c7a6d36f04fececd3674b;hb=de6759db987b07efdd5bf1f238f2d0d9eb8d3d4c;hp=dc45a3f16dd7560e5b5b2d863e212ef6654c30b8;hpb=cdea5a8631ae108b3b6520ba02642d99112806f7;p=spline3.git

diff --git a/src/Values.hs b/src/Values.hs
index dc45a3f..d7ede83 100644
--- a/src/Values.hs
+++ b/src/Values.hs
@@ -12,7 +12,7 @@ import Data.Array.Repa (
   DIM3,
   extent,
   fromList,
-  index,
+  unsafeIndex,
   reshape,
   size
   )
@@ -20,38 +20,32 @@ import Data.Array.Repa (
 import Data.Array.Repa.IO.Vector (readVectorFromTextFile,
                                   writeVectorToTextFile)
 import System.FilePath ()
-import Test.QuickCheck (Arbitrary(..), Gen)
+import Test.QuickCheck (Arbitrary(..), Gen, choose, vectorOf)
 
 
 import ScaleFactor
 
 
-type Values1D = Array DIM1 Double
-type Values2D = Array DIM2 Double
-type Values3D = Array DIM3 Double
+type Values sh = Array sh Double
+type Values1D = Values DIM1
+type Values2D = Values DIM2
+type Values3D = Values DIM3
 
 
 instance Arbitrary Values3D where
     arbitrary = do
-      x_dim <- arbitrary :: Gen Int
-      y_dim <- arbitrary :: Gen Int
-      z_dim <- arbitrary :: Gen Int
-      one_d <- arbitrary :: Gen Values1D
+      -- 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 = reshape new_shape one_d
+      let three_d = Data.Array.Repa.fromList new_shape elements
       return three_d
 
 
-instance Arbitrary Values1D where
-    arbitrary = do
-      x <- arbitrary :: Gen [Double]
-      let shape = (Z :. (length x))
-      let one_d = Data.Array.Repa.fromList shape x
-      return one_d
-
-
 read_values_1d :: FilePath -> IO Values1D
-read_values_1d path = readVectorFromTextFile path
+read_values_1d = readVectorFromTextFile
 
 
 read_values_3d :: DIM3 -> FilePath -> IO Values3D
@@ -79,7 +73,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)
@@ -93,3 +87,8 @@ zoom_shape (sfx, sfy, sfz) sh =
         z' = z * sfz
     in
       (Z :. x' :. y' :. z')
+
+
+drop_z :: DIM3 -> DIM2
+drop_z (Z :. 1 :. y :. x) = (Z :. y :. x)
+drop_z _ = error "can't drop the z-dimension unless its size is 1"