X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTests%2FGrid.hs;h=92ba20efbce2aa1c9f7bb843ec06806cb3e5d631;hb=ac0e94e82605a5fd1e3ee724cd597f48614689e4;hp=b50d0c1cacd9cd7f12b81c8ebca8a46591e32207;hpb=7bfd79b7cc06dfd0b08cf14794d7659a940b8f08;p=spline3.git

diff --git a/src/Tests/Grid.hs b/src/Tests/Grid.hs
index b50d0c1..92ba20e 100644
--- a/src/Tests/Grid.hs
+++ b/src/Tests/Grid.hs
@@ -3,7 +3,6 @@ where
 
 import Data.Maybe (fromJust)
 import Test.HUnit
-import Test.QuickCheck
 
 import Assertions
 import Comparisons
@@ -11,14 +10,9 @@ import Cube hiding (i, j, k)
 import Examples
 import FunctionValues (value_at)
 import Grid
+import Point (Point)
 import Tetrahedron
-
-
-instance Arbitrary Grid where
-    arbitrary = do
-      (Positive h') <- arbitrary :: Gen (Positive Double)
-      fvs <- arbitrary :: Gen [[[Double]]]
-      return (make_grid h' fvs)
+import ThreeDimensional
 
 
 -- | Check the value of c0030 for tetrahedron0 belonging to the
@@ -316,14 +310,14 @@ test_trilinear_reproduced =
                     | i <- [0..2],
                       j <- [0..2],
                       k <- [0..2],
+                      t <- tetrahedra c0,
+                      let p = polynomial t,
                       let i' = fromIntegral i,
                       let j' = fromIntegral j,
                       let k' = fromIntegral k]
     where
       g = make_grid 1 trilinear
       c0 = fromJust $ cube_at g 1 1 1
-      t0 = tetrahedron0 c0
-      p = polynomial t0
 
 
 test_zeros_reproduced :: Assertion
@@ -341,3 +335,45 @@ test_zeros_reproduced =
       c0 = fromJust $ cube_at g 1 1 1
       t0 = tetrahedron0 c0
       p = polynomial t0
+
+
+-- | Make sure we can reproduce a 9x9x9 trilinear from the 3x3x3 one.
+test_trilinear9x9x9_reproduced :: Assertion
+test_trilinear9x9x9_reproduced =
+    assertTrue "trilinear 9x9x9 is reproduced correctly" $
+      and [p (i', j', k') ~= value_at trilinear9x9x9 i j k
+            | i <- [0..8],
+              j <- [0..8],
+              k <- [0..8],
+              t <- tetrahedra c0,
+              let p = polynomial t,
+              let i' = (fromIntegral i) * 0.5,
+              let j' = (fromIntegral j) * 0.5,
+              let k' = (fromIntegral k) * 0.5]
+    where
+      g = make_grid 1 trilinear
+      c0 = fromJust $ cube_at g 1 1 1
+
+
+-- | The point 'p' in this test lies on the boundary of tetrahedra 12 and 15.
+--   However, the 'contains_point' test fails due to some numerical innacuracy.
+--   This bug should have been fixed by setting a positive tolerance level.
+--
+--   Example from before the fix:
+--
+--   > b0 (tetrahedron12 c) p
+--   -2.168404344971019e-18
+--   > b0 (tetrahedron15 c) p
+--   -3.4694469519536365e-18
+--
+test_tetrahedra_collision_sensitivity :: Assertion
+test_tetrahedra_collision_sensitivity =
+  assertTrue "tetrahedron collision tests aren't too sensitive" $
+             contains_point t12 p &&
+             contains_point t15 p
+  where
+    g = make_grid 1 trilinear
+    c = cube_at g 0 17 1
+    p = (0, 16.75, 0.5) :: Point
+    t12 = tetrahedron12 c
+    t15 = tetrahedron15 c