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

diff --git a/src/Main.hs b/src/Main.hs
index 4b375cf..b8edf9e 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -2,34 +2,20 @@ module Main
 where
 
 import Data.Array.Repa (
-  Array,
-  DIM1,
   DIM3,
-  Shape,
   Z(..),
   (:.)(..),
-  index,
-  reshape,
-  toList
   )
 
-import Data.Array.Repa.IO.Vector (readVectorFromTextFile)
-
---import Grid(make_grid, zoom)
-
-
-read_mri_data :: IO (Array DIM1 Int)
-read_mri_data = readVectorFromTextFile "./data/mridata.txt"
+import Values
+import Grid(make_grid, zoom)
 
 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
-  print tmp
---  let g = make_grid 1 (Data.Array.Repa.toList mridata2)
---  let output = zoom g 2
---  print "Hello, world."
+  mridata <- read_values_3d mri_shape "./data/mridata.txt"
+  let g = make_grid 1 mridata
+  let output = zoom g 1
+  write_values_1d output "output.txt"