Clean up imports/exports.

[spline3.git] / src / Values.hs

diff --git a/src/Values.hs b/src/Values.hs
index d7ede8399391b3229a1c7a6d36f04fececd3674b..a4720252bbe626ae70a52913822ed318665ffc08 100644 (file)
--- a/src/Values.hs
+++ b/src/Values.hs
@@ -1,6 +1,15 @@
 {-# LANGUAGE FlexibleInstances #-}
 
-module Values
+module Values (
+  Values,
+  Values2D,
+  Values3D,
+  dims,
+  empty3d,
+  idx,
+  read_values_3d,
+  zoom_shape
+  )
 where
 
 import Data.Array.Repa (
@@ -13,17 +22,15 @@ import Data.Array.Repa (
   extent,
   fromList,
   unsafeIndex,
-  reshape,
-  size
+  reshape
   )
 
-import Data.Array.Repa.IO.Vector (readVectorFromTextFile,
-                                  writeVectorToTextFile)
+import Data.Array.Repa.IO.Vector (readVectorFromTextFile)
 import System.FilePath ()
 import Test.QuickCheck (Arbitrary(..), Gen, choose, vectorOf)
 
 
-import ScaleFactor
+import ScaleFactor (ScaleFactor)
 
 
 type Values sh = Array sh Double
@@ -53,13 +60,6 @@ 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) []
 
@@ -87,8 +87,3 @@ zoom_shape (sfx, sfy, sfz) sh =
         z' = z * sfz
     in
       (Z :. x' :. y' :. z')
-
-
-drop_z :: DIM3 -> DIM2
-drop_z (Z :. 1 :. y :. x) = (Z :. y :. x)
-drop_z _ = error "can't drop the z-dimension unless its size is 1"