X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FValues.hs;h=e21bacf1e906c553e3bda167e9fea3947d4ba8ff;hb=9d123d52885618214e14e9fdefb2f3f43c329ddd;hp=b5dc15a9c6299bb0ec74511a8e561d6c0bdcf09a;hpb=715be016934300f596a11e4fc5b8ca2ec42d6c34;p=spline3.git diff --git a/src/Values.hs b/src/Values.hs index b5dc15a..e21bacf 100644 --- a/src/Values.hs +++ b/src/Values.hs @@ -7,26 +7,20 @@ module Values ( dims, empty3d, idx, - zoom_shape - ) + zoom_shape ) where import Data.Array.Repa ( Array, U, - Z(..), - (:.)(..), + Z( Z ), + (:.)( (:.) ), DIM2, DIM3, extent, fromListUnboxed, - unsafeIndex, - ) + unsafeIndex ) -import System.FilePath () -import Test.QuickCheck (Arbitrary(..), Gen, choose, vectorOf) - - -import ScaleFactor (ScaleFactor) +import ScaleFactor ( ScaleFactor ) type Values sh = Array U sh Double @@ -34,18 +28,6 @@ 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.fromListUnboxed new_shape elements - return three_d - - empty3d :: Values3D empty3d = Data.Array.Repa.fromListUnboxed (Z :. 0 :. 0 :. 0) []