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

diff --git a/src/Values.hs b/src/Values.hs
index bd7c4d6..070abbb 100644
--- a/src/Values.hs
+++ b/src/Values.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TypeSynonymInstances #-}
+{-# LANGUAGE FlexibleInstances #-}
 
 module Values
 where
@@ -12,13 +12,18 @@ import Data.Array.Repa (
   DIM3,
   extent,
   fromList,
-  index,
+  unsafeIndex,
   reshape,
+  size
   )
 
-import Data.Array.Repa.IO.Vector (readVectorFromTextFile)
+import Data.Array.Repa.IO.Vector (readVectorFromTextFile,
+                                  writeVectorToTextFile)
 import System.FilePath ()
-import Test.QuickCheck (Arbitrary(..), Gen)
+import Test.QuickCheck (Arbitrary(..), Gen, choose, vectorOf)
+
+
+import ScaleFactor
 
 
 type Values1D = Array DIM1 Double
@@ -28,25 +33,18 @@ 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
+      -- 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 = reshape new_shape one_d
+      let three_d = Data.Array.Repa.fromList new_shape elements
       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
+read_values_1d = readVectorFromTextFile
 
 
 read_values_3d :: DIM3 -> FilePath -> IO Values3D
@@ -54,6 +52,12 @@ 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) []
@@ -68,7 +72,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 :. i :. j :. k)
+
+
+zoom_shape :: ScaleFactor -> DIM3 -> DIM3
+zoom_shape (sfx, sfy, sfz) sh =
+    let (Z :. x :. y :. z) = sh
+        x' = x * sfx
+        y' = y * sfy
+        z' = z * sfz
+    in
+      (Z :. x' :. y' :. z')