Inline Tetrahedron functions volume, b0, b1, b2, and b3 (Ben Lippmeier).

[spline3.git] / src / Values.hs

diff --git a/src/Values.hs b/src/Values.hs
index bd7c4d66af25ba443a6afe7f72d7bc6885df7f3b..8e40212eda252af463b231782b9f424ce4ba48ad 100644 (file)
--- a/src/Values.hs
+++ b/src/Values.hs
@@ -1,60 +1,51 @@
-{-# LANGUAGE TypeSynonymInstances #-}
-
-module Values
+{-# LANGUAGE FlexibleInstances #-}
+
+module Values (
+  Values,
+  Values2D,
+  Values3D,
+  dims,
+  empty3d,
+  idx,
+  zoom_shape
+  )
 where
 
 import Data.Array.Repa (
   Array,
   Z(..),
   (:.)(..),
-  DIM1,
   DIM2,
   DIM3,
   extent,
   fromList,
-  index,
-  reshape,
+  unsafeIndex,
   )
 
-import Data.Array.Repa.IO.Vector (readVectorFromTextFile)
 import System.FilePath ()
-import Test.QuickCheck (Arbitrary(..), Gen)
+import Test.QuickCheck (Arbitrary(..), Gen, choose, vectorOf)
+
+
+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
     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_3d :: DIM3 -> FilePath -> IO Values3D
-read_values_3d sh path = do
-  one_d <- read_values_1d path
-  return $ reshape sh one_d
-
-
 empty3d :: Values3D
 empty3d = Data.Array.Repa.fromList (Z :. 0 :. 0 :. 0) []
 
@@ -68,7 +59,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')