X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FValues.hs;h=8e40212eda252af463b231782b9f424ce4ba48ad;hb=83e7315396684663d9d9893ec798381682bb1f9b;hp=a4720252bbe626ae70a52913822ed318665ffc08;hpb=f390abd1832938411a581d595c847a7a1aeeb237;p=spline3.git diff --git a/src/Values.hs b/src/Values.hs index a472025..8e40212 100644 --- a/src/Values.hs +++ b/src/Values.hs @@ -7,7 +7,6 @@ module Values ( dims, empty3d, idx, - read_values_3d, zoom_shape ) where @@ -16,16 +15,13 @@ import Data.Array.Repa ( Array, Z(..), (:.)(..), - DIM1, DIM2, DIM3, extent, fromList, unsafeIndex, - reshape ) -import Data.Array.Repa.IO.Vector (readVectorFromTextFile) import System.FilePath () import Test.QuickCheck (Arbitrary(..), Gen, choose, vectorOf) @@ -34,7 +30,6 @@ import ScaleFactor (ScaleFactor) type Values sh = Array sh Double -type Values1D = Values DIM1 type Values2D = Values DIM2 type Values3D = Values DIM3 @@ -51,15 +46,6 @@ instance Arbitrary Values3D where return three_d -read_values_1d :: FilePath -> IO Values1D -read_values_1d = readVectorFromTextFile - - -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) []