X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FValues.hs;h=b5dc15a9c6299bb0ec74511a8e561d6c0bdcf09a;hb=d910ddbbb9e6b9c8bf8169ce30c42660ad8746d4;hp=070abbbf2554ea5eec5276e5496fe1554fcaf3d3;hpb=c832bb3ac428a0d96759d9c82e9547d3acf4353d;p=spline3.git

diff --git a/src/Values.hs b/src/Values.hs
index 070abbb..b5dc15a 100644
--- a/src/Values.hs
+++ b/src/Values.hs
@@ -1,34 +1,37 @@
 {-# LANGUAGE FlexibleInstances #-}
 
-module Values
+module Values (
+  Values,
+  Values2D,
+  Values3D,
+  dims,
+  empty3d,
+  idx,
+  zoom_shape
+  )
 where
 
 import Data.Array.Repa (
-  Array,
+  Array, U,
   Z(..),
   (:.)(..),
-  DIM1,
   DIM2,
   DIM3,
   extent,
-  fromList,
+  fromListUnboxed,
   unsafeIndex,
-  reshape,
-  size
   )
 
-import Data.Array.Repa.IO.Vector (readVectorFromTextFile,
-                                  writeVectorToTextFile)
 import System.FilePath ()
 import Test.QuickCheck (Arbitrary(..), Gen, choose, vectorOf)
 
 
-import ScaleFactor
+import ScaleFactor (ScaleFactor)
 
 
-type Values1D = Array DIM1 Double
-type Values2D = Array DIM2 Double
-type Values3D = Array DIM3 Double
+type Values sh = Array U sh Double
+type Values2D  = Values DIM2
+type Values3D  = Values DIM3
 
 
 instance Arbitrary Values3D where
@@ -39,28 +42,12 @@ instance Arbitrary Values3D where
       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
+      let three_d = Data.Array.Repa.fromListUnboxed 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)