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

diff --git a/src/Values.hs b/src/Values.hs
index dab9e34..e21bacf 100644
--- a/src/Values.hs
+++ b/src/Values.hs
@@ -1,65 +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,
-  index,
-  reshape,
-  size
-  )
+  fromListUnboxed,
+  unsafeIndex )
 
-import Data.Array.Repa.IO.Vector (readVectorFromTextFile,
-                                  writeVectorToTextFile)
-import System.FilePath ()
-import Test.QuickCheck (Arbitrary(..), Gen, Positive(..), vectorOf)
+import ScaleFactor ( ScaleFactor )
 
 
-import ScaleFactor
+type Values sh = Array U sh Double
+type Values2D  = Values DIM2
+type Values3D  = Values DIM3
 
 
-type Values1D = Array DIM1 Double
-type Values2D = Array DIM2 Double
-type Values3D = Array DIM3 Double
-
-
-instance Arbitrary Values3D where
-    arbitrary = do
-      (Positive x_dim) <- arbitrary :: Gen (Positive Int)
-      (Positive y_dim) <- arbitrary :: Gen (Positive Int)
-      (Positive z_dim) <- arbitrary :: Gen (Positive Int)
-      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)
@@ -71,7 +41,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)