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

diff --git a/src/Values.hs b/src/Values.hs
index 8e2b61e..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
   )
@@ -26,9 +26,10 @@ 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
@@ -72,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)
@@ -86,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"