X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FGrid.hs;h=ca66437a6bb13b73d591b68d1b16d3ead8d60c89;hb=3f7331f579118687cd73b977ce6aa7d401f88a09;hp=6170d36d612bb7048ad99c356860f20f5052a4c7;hpb=9712b55ab9a0672a5edc95cb4943d9ffca145c29;p=spline3.git

diff --git a/src/Grid.hs b/src/Grid.hs
index 6170d36..ca66437 100644
--- a/src/Grid.hs
+++ b/src/Grid.hs
@@ -11,7 +11,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 +21,18 @@ import Test.QuickCheck ((==>),
                         Positive(..),
                         Property,
                         choose)
-import Assertions
-import Comparisons
+import Assertions (assertAlmostEqual, assertClose, 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)
 
 
@@ -291,6 +291,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,
@@ -298,7 +299,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
@@ -310,12 +311,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.
@@ -496,15 +498,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 ]