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

diff --git a/src/Values.hs b/src/Values.hs
index d7ede83..e21bacf 100644
--- a/src/Values.hs
+++ b/src/Values.hs
@@ -1,67 +1,35 @@
 {-# LANGUAGE FlexibleInstances #-}
 
-module Values
+module Values (
+  Values,
+  Values2D,
+  Values3D,
+  dims,
+  empty3d,
+  idx,
+  zoom_shape )
 where
 
 import Data.Array.Repa (
-  Array,
-  Z(..),
-  (:.)(..),
-  DIM1,
+  Array, U,
+  Z( Z ),
+  (:.)( (:.) ),
   DIM2,
   DIM3,
   extent,
-  fromList,
-  unsafeIndex,
-  reshape,
-  size
-  )
+  fromListUnboxed,
+  unsafeIndex )
 
-import Data.Array.Repa.IO.Vector (readVectorFromTextFile,
-                                  writeVectorToTextFile)
-import System.FilePath ()
-import Test.QuickCheck (Arbitrary(..), Gen, choose, vectorOf)
+import ScaleFactor ( ScaleFactor )
 
 
-import ScaleFactor
+type Values sh = Array U sh Double
+type Values2D  = Values DIM2
+type Values3D  = Values DIM3
 
 
-type Values sh = Array sh Double
-type Values1D = Values DIM1
-type Values2D = Values DIM2
-type Values3D = Values DIM3
-
-
-instance Arbitrary Values3D where
-    arbitrary = do
-      -- 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
-      return three_d
-
-
-read_values_1d :: FilePath -> IO Values1D
-read_values_1d = readVectorFromTextFile
-
-
-read_values_3d :: DIM3 -> FilePath -> IO Values3D
-read_values_3d sh path = do
-  one_d <- read_values_1d path
-  return $ reshape sh one_d
-
-write_values_1d :: Values3D -> FilePath -> IO ()
-write_values_1d v3d path = do
-  let size3d = size $ extent v3d
-  let shape1d = (Z :. size3d)
-  let v1d = reshape shape1d v3d
-  writeVectorToTextFile v1d path
-
 empty3d :: Values3D
-empty3d = Data.Array.Repa.fromList (Z :. 0 :. 0 :. 0) []
+empty3d = Data.Array.Repa.fromListUnboxed (Z :. 0 :. 0 :. 0) []
 
 
 dims :: Values3D -> (Int, Int, Int)
@@ -87,8 +55,3 @@ 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"