X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FValues.hs;h=7fc577529f9ccdd2ce0fe1fc85cf14d8744e1e21;hb=fd3d394c27e3a90de8238b98bd112c4fe3468ee0;hp=61e3a11d3c2cd274afb5963bd5ba4091c8d4df86;hpb=043d7296b08add8050a54c463d06c78b06eb9838;p=spline3.git

diff --git a/src/Values.hs b/src/Values.hs
index 61e3a11..7fc5775 100644
--- a/src/Values.hs
+++ b/src/Values.hs
@@ -1,70 +1,39 @@
-{-# LANGUAGE TypeSynonymInstances #-}
-
-module Values
+{-# LANGUAGE FlexibleInstances #-}
+
+module Values (
+  Values,
+  Values2D,
+  Values3D,
+  dims,
+  empty3d,
+  idx,
+  zoom_shape
+  )
 where
 
 import Data.Array.Repa (
-  Array,
+  Array, U,
   Z(..),
   (:.)(..),
-  DIM1,
   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)
-
-
-type Values1D = Array DIM1 Double
-type Values2D = Array DIM2 Double
-type Values3D = Array DIM3 Double
-
-
-instance Arbitrary Values3D where
-    arbitrary = do
-      x_dim <- arbitrary :: Gen Int
-      y_dim <- arbitrary :: Gen Int
-      z_dim <- arbitrary :: Gen Int
-      one_d <- arbitrary :: Gen Values1D
-      let new_shape = (Z :. x_dim :. y_dim :. z_dim)
-      let three_d = reshape new_shape one_d
-      return three_d
-
-
-instance Arbitrary Values1D where
-    arbitrary = do
-      x <- arbitrary :: Gen [Double]
-      let shape = (Z :. (length x))
-      let one_d = Data.Array.Repa.fromList shape x
-      return one_d
-
 
-read_values_1d :: FilePath -> IO Values1D
-read_values_1d path = readVectorFromTextFile path
+import ScaleFactor (ScaleFactor)
 
 
-read_values_3d :: DIM3 -> FilePath -> IO Values3D
-read_values_3d sh path = do
-  one_d <- read_values_1d path
-  return $ reshape sh one_d
+type Values sh = Array U sh Double
+type Values2D  = Values DIM2
+type Values3D  = Values DIM3
 
-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)
@@ -76,17 +45,17 @@ dims v3d =
 
 idx :: Values3D -> Int -> Int -> Int -> Double
 idx v3d i j k =
-    index v3d shape
+    unsafeIndex v3d shape
     where
       shape :: DIM3
-      shape = (Z :. k :. j :. i)
+      shape = (Z :. i :. j :. k)
 
 
-zoom_shape :: Int -> DIM3 -> DIM3
-zoom_shape scale_factor sh =
+zoom_shape :: ScaleFactor -> DIM3 -> DIM3
+zoom_shape (sfx, sfy, sfz) sh =
     let (Z :. x :. y :. z) = sh
-        x' = x * scale_factor
-        y' = y * scale_factor
-        z' = z * scale_factor
+        x' = x * sfx
+        y' = y * sfy
+        z' = z * sfz
     in
       (Z :. x' :. y' :. z')