Clean up imports/exports.

[spline3.git] / src / Values.hs

diff --git a/src/Values.hs b/src/Values.hs
index 070abbbf2554ea5eec5276e5496fe1554fcaf3d3..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,22 +22,21 @@ 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 Values1D = Array DIM1 Double
-type Values2D = Array DIM2 Double
-type Values3D = Array DIM3 Double
+type Values sh = Array sh Double
+type Values1D = Values DIM1
+type Values2D = Values DIM2
+type Values3D = Values DIM3
 
 
 instance Arbitrary Values3D where
@@ -52,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) []