X-Git-Url: http://gitweb.michael.orlitzky.com/?p=spline3.git;a=blobdiff_plain;f=src%2FValues.hs;h=7fc577529f9ccdd2ce0fe1fc85cf14d8744e1e21;hp=614fb75991359ff8f47c80969721a5bb75598d51;hb=fd3d394c27e3a90de8238b98bd112c4fe3468ee0;hpb=c93a9fd2d3623feb4e87678685c71a8940e98869

diff --git a/src/Values.hs b/src/Values.hs
index 614fb75..7fc5775 100644
--- a/src/Values.hs
+++ b/src/Values.hs
@@ -1,67 +1,39 @@
 {-# LANGUAGE FlexibleInstances #-}
 
-module Values
+module Values (
+  Values,
+  Values2D,
+  Values3D,
+  dims,
+  empty3d,
+  idx,
+  zoom_shape
+  )
 where
 
 import Data.Array.Repa (
-  Array,
+  Array, U,
   Z(..),
   (:.)(..),
-  DIM1,
   DIM2,
   DIM3,
   extent,
-  fromList,
+  fromListUnboxed,
   unsafeIndex,
-  reshape,
-  size
   )
 
-import Data.Array.Repa.IO.Vector (readVectorFromTextFile,
-                                  writeVectorToTextFile)
 import System.FilePath ()
-import Test.QuickCheck (Arbitrary(..), Gen, choose, vectorOf)
-
-
-import ScaleFactor
-
-
-type Values sh = Array sh Double
-type Values1D = Values DIM1
-type Values2D = Values DIM2
-type Values3D = Values DIM3
-
-
-instance Arbitrary Values3D where
-    arbitrary = do
-      -- 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 = Data.Array.Repa.fromList new_shape elements
-      return three_d
-
 
-read_values_1d :: FilePath -> IO Values1D
-read_values_1d = readVectorFromTextFile
+import ScaleFactor (ScaleFactor)
 
 
-read_values_3d :: DIM3 -> FilePath -> IO Values3D
-read_values_3d sh path = do
-  one_d <- read_values_1d path
-  return $ reshape sh one_d
+type Values sh = Array U sh Double
+type Values2D  = Values DIM2
+type Values3D  = Values DIM3
 
-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) []
+empty3d = Data.Array.Repa.fromListUnboxed (Z :. 0 :. 0 :. 0) []
 
 
 dims :: Values3D -> (Int, Int, Int)