X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FGrid.hs;fp=src%2FGrid.hs;h=d98bda1d0ce0e602bee9796c245dd10666d74176;hb=0696fc4f3e428d2156f0be4ca40728abf2e35abe;hp=43e60ef2c17948e78e334b2c49847b4c1fa19f50;hpb=d47fe5a8e167d8bdc0b4edf2899eee351615ccf8;p=spline3.git

diff --git a/src/Grid.hs b/src/Grid.hs
index 43e60ef..d98bda1 100644
--- a/src/Grid.hs
+++ b/src/Grid.hs
@@ -77,7 +77,7 @@ cube_at !g !i !j !k =
    where
      fvs = function_values g
      fvs' = make_values fvs i j k
-     tet_vol = (1/24) :: Double
+     tet_vol = (1 / 24) :: Double
 
 
 --   The first cube along any axis covers (-1/2, 1/2). The second
@@ -96,7 +96,7 @@ calculate_containing_cube_coordinate g coord
     | otherwise = (ceiling (coord + offset)) - 1
     where
       (xsize, ysize, zsize) = dims (function_values g)
-      offset = (1/2) :: Double
+      offset = (1 / 2) :: Double
 
 
 -- | Takes a 'Grid', and returns a 'Cube' containing the given 'Point'.
@@ -121,7 +121,7 @@ zoom_result v3d (sfx, sfy, sfz) (Z :. m :. n :. o) =
   f p
   where
     g = Grid v3d
-    offset = (1/2) :: Double
+    offset = (1 / 2) :: Double
     m' = (fromIntegral m) / (fromIntegral sfx) - offset
     n' = (fromIntegral n) / (fromIntegral sfy) - offset
     o' = (fromIntegral o) / (fromIntegral sfz) - offset
@@ -191,63 +191,63 @@ trilinear_c0_t0_tests =
 
     test_trilinear_c0030 :: Assertion
     test_trilinear_c0030 =
-      assertAlmostEqual "c0030 is correct" (c t 0 0 3 0) (17/8)
+      assertAlmostEqual "c0030 is correct" (c t 0 0 3 0) (17 / 8)
 
     test_trilinear_c0003 :: Assertion
     test_trilinear_c0003 =
-      assertAlmostEqual "c0003 is correct" (c t 0 0 0 3) (27/8)
+      assertAlmostEqual "c0003 is correct" (c t 0 0 0 3) (27 / 8)
 
     test_trilinear_c0021 :: Assertion
     test_trilinear_c0021 =
-      assertAlmostEqual "c0021 is correct" (c t 0 0 2 1) (61/24)
+      assertAlmostEqual "c0021 is correct" (c t 0 0 2 1) (61 / 24)
 
     test_trilinear_c0012 :: Assertion
     test_trilinear_c0012 =
-      assertAlmostEqual "c0012 is correct" (c t 0 0 1 2) (71/24)
+      assertAlmostEqual "c0012 is correct" (c t 0 0 1 2) (71 / 24)
 
     test_trilinear_c0120 :: Assertion
     test_trilinear_c0120 =
-      assertAlmostEqual "c0120 is correct" (c t 0 1 2 0) (55/24)
+      assertAlmostEqual "c0120 is correct" (c t 0 1 2 0) (55 / 24)
 
     test_trilinear_c0102 :: Assertion
     test_trilinear_c0102 =
-      assertAlmostEqual "c0102 is correct" (c t 0 1 0 2) (73/24)
+      assertAlmostEqual "c0102 is correct" (c t 0 1 0 2) (73 / 24)
 
     test_trilinear_c0111 :: Assertion
     test_trilinear_c0111 =
-      assertAlmostEqual "c0111 is correct" (c t 0 1 1 1) (8/3)
+      assertAlmostEqual "c0111 is correct" (c t 0 1 1 1) (8 / 3)
 
     test_trilinear_c0210 :: Assertion
     test_trilinear_c0210 =
-      assertAlmostEqual "c0210 is correct" (c t 0 2 1 0) (29/12)
+      assertAlmostEqual "c0210 is correct" (c t 0 2 1 0) (29 / 12)
 
     test_trilinear_c0201 :: Assertion
     test_trilinear_c0201 =
-      assertAlmostEqual "c0201 is correct" (c t 0 2 0 1) (11/4)
+      assertAlmostEqual "c0201 is correct" (c t 0 2 0 1) (11 / 4)
 
     test_trilinear_c0300 :: Assertion
     test_trilinear_c0300 =
-      assertAlmostEqual "c0300 is correct" (c t 0 3 0 0) (5/2)
+      assertAlmostEqual "c0300 is correct" (c t 0 3 0 0) (5 / 2)
 
     test_trilinear_c1020 :: Assertion
     test_trilinear_c1020 =
-      assertAlmostEqual "c1020 is correct" (c t 1 0 2 0) (8/3)
+      assertAlmostEqual "c1020 is correct" (c t 1 0 2 0) (8 / 3)
 
     test_trilinear_c1002 :: Assertion
     test_trilinear_c1002 =
-      assertAlmostEqual "c1002 is correct" (c t 1 0 0 2) (23/6)
+      assertAlmostEqual "c1002 is correct" (c t 1 0 0 2) (23 / 6)
 
     test_trilinear_c1011 :: Assertion
     test_trilinear_c1011 =
-      assertAlmostEqual "c1011 is correct" (c t 1 0 1 1) (13/4)
+      assertAlmostEqual "c1011 is correct" (c t 1 0 1 1) (13 / 4)
 
     test_trilinear_c1110 :: Assertion
     test_trilinear_c1110 =
-      assertAlmostEqual "c1110 is correct" (c t 1 1 1 0) (23/8)
+      assertAlmostEqual "c1110 is correct" (c t 1 1 1 0) (23 / 8)
 
     test_trilinear_c1101 :: Assertion
     test_trilinear_c1101 =
-      assertAlmostEqual "c1101 is correct" (c t 1 1 0 1) (27/8)
+      assertAlmostEqual "c1101 is correct" (c t 1 1 0 1) (27 / 8)
 
     test_trilinear_c1200 :: Assertion
     test_trilinear_c1200 =
@@ -255,7 +255,7 @@ trilinear_c0_t0_tests =
 
     test_trilinear_c2010 :: Assertion
     test_trilinear_c2010 =
-      assertAlmostEqual "c2010 is correct" (c t 2 0 1 0) (10/3)
+      assertAlmostEqual "c2010 is correct" (c t 2 0 1 0) (10 / 3)
 
     test_trilinear_c2001 :: Assertion
     test_trilinear_c2001 =
@@ -263,7 +263,7 @@ trilinear_c0_t0_tests =
 
     test_trilinear_c2100 :: Assertion
     test_trilinear_c2100 =
-      assertAlmostEqual "c2100 is correct" (c t 2 1 0 0) (7/2)
+      assertAlmostEqual "c2100 is correct" (c t 2 1 0 0) (7 / 2)
 
     test_trilinear_c3000 :: Assertion
     test_trilinear_c3000 =
@@ -344,12 +344,12 @@ test_trilinear9x9x9_reproduced =
 prop_cube_indices_never_go_out_of_bounds :: Grid -> Gen Bool
 prop_cube_indices_never_go_out_of_bounds g =
   do
-    let coordmin = negate (1/2) :: Double
+    let coordmin = negate (1 / 2) :: Double
 
     let (xsize, ysize, zsize) = dims $ function_values g
-    let xmax = (fromIntegral xsize) - (1/2) :: Double
-    let ymax = (fromIntegral ysize) - (1/2) :: Double
-    let zmax = (fromIntegral zsize) - (1/2) :: Double
+    let xmax = (fromIntegral xsize) - (1 / 2) :: Double
+    let ymax = (fromIntegral ysize) - (1 / 2) :: Double
+    let zmax = (fromIntegral zsize) - (1 / 2) :: Double
 
     x <- choose (coordmin, xmax)
     y <- choose (coordmin, ymax)