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

diff --git a/src/Values.hs b/src/Values.hs
index 8e2b61e..8e40212 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,
   Z(..),
   (:.)(..),
-  DIM1,
   DIM2,
   DIM3,
   extent,
   fromList,
-  index,
-  reshape,
-  size
+  unsafeIndex,
   )
 
-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 sh Double
+type Values2D = Values DIM2
+type Values3D = Values DIM3
 
 
 instance Arbitrary Values3D where
@@ -43,22 +46,6 @@ instance Arbitrary Values3D where
       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) []
 
@@ -72,7 +59,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)