X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=bc63265195b474f1ca4da545ec67148709533c93;hb=5a878334c2ca29fcaf7b5e5c8c9700d866134a22;hp=4b375cf57df6d4b0dd0a2d886d3b1154e4e02af0;hpb=850eb18add24bc0b455b1691f3c979f80f8daec9;p=spline3.git

diff --git a/src/Main.hs b/src/Main.hs
index 4b375cf..bc63265 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -2,33 +2,22 @@ module Main
 where
 
 import Data.Array.Repa (
-  Array,
-  DIM1,
   DIM3,
-  Shape,
   Z(..),
   (:.)(..),
-  index,
-  reshape,
   toList
   )
 
-import Data.Array.Repa.IO.Vector (readVectorFromTextFile)
-
+import Values
 --import Grid(make_grid, zoom)
 
-
-read_mri_data :: IO (Array DIM1 Int)
-read_mri_data = readVectorFromTextFile "./data/mridata.txt"
-
 mri_shape :: DIM3
 mri_shape = (Z :. 256 :. 256 :. 109)
 
 main :: IO ()
 main = do
-  mridata <- read_mri_data
-  let mridata2 = reshape mri_shape mridata
-  let tmp = Data.Array.Repa.toList mridata2
+  mridata <- read_values_3d mri_shape "./data/mridata.txt"
+  let tmp = Data.Array.Repa.toList mridata
   print tmp
 --  let g = make_grid 1 (Data.Array.Repa.toList mridata2)
 --  let output = zoom g 2