X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FGrid.hs;h=d5553b426fc6c18c38438afec5d3039ee1c2a4cc;hb=610d0f0af8a802c26d51231d6e2426a72e40fd2d;hp=f8fb3310f9ab32cdada246305376ccbf896fb8f2;hpb=ac9636ad08f50d7d40188dc8d29a8e2fdf169426;p=spline3.git

diff --git a/src/Grid.hs b/src/Grid.hs
index f8fb331..d5553b4 100644
--- a/src/Grid.hs
+++ b/src/Grid.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE BangPatterns #-}
 -- | The Grid module just contains the Grid type and two constructors
 --   for it. We hide the main Grid constructor because we don't want
 --   to allow instantiation of a grid with h <= 0.
@@ -11,7 +12,7 @@ module Grid (
 where
 
 import qualified Data.Array.Repa as R
-import Test.HUnit
+import Test.HUnit (Assertion, assertEqual)
 import Test.Framework (Test, testGroup)
 import Test.Framework.Providers.HUnit (testCase)
 import Test.Framework.Providers.QuickCheck2 (testProperty)
@@ -21,18 +22,18 @@ import Test.QuickCheck ((==>),
                         Positive(..),
                         Property,
                         choose)
-import Assertions
-import Comparisons
+import Assertions (assertAlmostEqual, assertTrue)
+import Comparisons ((~=))
 import Cube (Cube(Cube),
              find_containing_tetrahedron,
              tetrahedra,
              tetrahedron)
-import Examples
-import FunctionValues
+import Examples (trilinear, trilinear9x9x9, zeros, naturals_1d)
+import FunctionValues (make_values, value_at)
 import Point (Point)
-import ScaleFactor
+import ScaleFactor (ScaleFactor)
 import Tetrahedron (Tetrahedron, c, polynomial, v0, v1, v2, v3)
-import ThreeDimensional
+import ThreeDimensional (ThreeDimensional(..))
 import Values (Values3D, dims, empty3d, zoom_shape)
 
 
@@ -65,7 +66,7 @@ make_grid grid_size values
 --   centered on that position. If there is no cube there (i.e. the
 --   position is outside of the grid), it will throw an error.
 cube_at :: Grid -> Int -> Int -> Int -> Cube
-cube_at g i j k
+cube_at !g !i !j !k
     | i < 0      = error "i < 0 in cube_at"
     | i >= xsize = error "i >= xsize in cube_at"
     | j < 0      = error "j < 0 in cube_at"
@@ -113,13 +114,11 @@ find_containing_cube g p =
       k = calculate_containing_cube_coordinate g z
 
 
-{-# INLINE zoom_lookup #-}
 zoom_lookup :: Values3D -> ScaleFactor -> a -> (R.DIM3 -> Double)
 zoom_lookup v3d scale_factor _ =
     zoom_result v3d scale_factor
 
 
-{-# INLINE zoom_result #-}
 zoom_result :: Values3D -> ScaleFactor -> R.DIM3 -> Double
 zoom_result v3d (sfx, sfy, sfz) (R.Z R.:. m R.:. n R.:. o) =
   f p
@@ -283,7 +282,7 @@ trilinear_c0_t0_tests =
 
     test_trilinear_f0_t0_v3 :: Assertion
     test_trilinear_f0_t0_v3 =
-      assertClose "v3 is correct" (v3 t) (0.5, 1.5, 1.5)
+      assertEqual "v3 is correct" (v3 t) (0.5, 1.5, 1.5)
 
 
 test_trilinear_reproduced :: Assertion
@@ -293,6 +292,7 @@ test_trilinear_reproduced =
                     | i <- [0..2],
                       j <- [0..2],
                       k <- [0..2],
+                      c0 <- cs,
                       t <- tetrahedra c0,
                       let p = polynomial t,
                       let i' = fromIntegral i,
@@ -300,7 +300,7 @@ test_trilinear_reproduced =
                       let k' = fromIntegral k]
     where
       g = make_grid 1 trilinear
-      c0 = cube_at g 1 1 1
+      cs = [ cube_at g ci cj ck | ci <- [0..2], cj <- [0..2], ck <- [0..2] ]
 
 
 test_zeros_reproduced :: Assertion
@@ -312,12 +312,13 @@ test_zeros_reproduced =
                       k <- [0..2],
                       let i' = fromIntegral i,
                       let j' = fromIntegral j,
-                      let k' = fromIntegral k]
+                      let k' = fromIntegral k,
+                      c0 <- cs,
+                      t0 <- tetrahedra c0,
+                      let p = polynomial t0 ]
     where
       g = make_grid 1 zeros
-      c0 = cube_at g 1 1 1
-      t0 = tetrahedron c0 0
-      p = polynomial t0
+      cs = [ cube_at g ci cj ck | ci <- [0..2], cj <- [0..2], ck <- [0..2] ]
 
 
 -- | Make sure we can reproduce a 9x9x9 trilinear from the 3x3x3 one.
@@ -498,15 +499,15 @@ grid_tests =
       trilinear_c0_t0_tests,
       p80_29_properties,
       testCase "tetrahedra collision test isn't too sensitive"
-         test_tetrahedra_collision_sensitivity,
-      testCase "trilinear reproduced" test_trilinear_reproduced,
-      testCase "zeros reproduced" test_zeros_reproduced ]
+        test_tetrahedra_collision_sensitivity,
+      testProperty "cube indices within bounds"
+        prop_cube_indices_never_go_out_of_bounds ]
 
 
 -- Do the slow tests last so we can stop paying attention.
 slow_tests :: Test.Framework.Test
 slow_tests =
     testGroup "Slow Tests" [
-      testProperty "cube indices within bounds"
-                   prop_cube_indices_never_go_out_of_bounds,
-      testCase "trilinear9x9x9 reproduced" test_trilinear9x9x9_reproduced ]
+      testCase "trilinear reproduced" test_trilinear_reproduced,
+      testCase "trilinear9x9x9 reproduced" test_trilinear9x9x9_reproduced,
+      testCase "zeros reproduced" test_zeros_reproduced ]