Clean up some hLint warnings.

[spline3.git] / src / Values.hs

diff --git a/src/Values.hs b/src/Values.hs
index 61e3a11d3c2cd274afb5963bd5ba4091c8d4df86..2efd80b6f8b167e58dde3efe1250cf48f9df79db 100644 (file)
--- a/src/Values.hs
+++ b/src/Values.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TypeSynonymInstances #-}
+{-# LANGUAGE FlexibleInstances #-}
 
 module Values
 where
@@ -23,6 +23,9 @@ import System.FilePath ()
 import Test.QuickCheck (Arbitrary(..), Gen)
 
 
+import ScaleFactor
+
+
 type Values1D = Array DIM1 Double
 type Values2D = Array DIM2 Double
 type Values3D = Array DIM3 Double
@@ -48,7 +51,7 @@ instance Arbitrary Values1D where
 
 
 read_values_1d :: FilePath -> IO Values1D
-read_values_1d path = readVectorFromTextFile path
+read_values_1d = readVectorFromTextFile
 
 
 read_values_3d :: DIM3 -> FilePath -> IO Values3D
@@ -79,14 +82,14 @@ idx v3d i j k =
     index 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')