X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTests%2FGrid.hs;h=f94a519566c2efc6f37dcd9675b2a85ee7e32b3e;hb=518b4b43bfd6c7c1d09841ca3ff5eeae089351ea;hp=750cff81a3d1156000b6b8f78543d7c6451d54e7;hpb=a2cc10f44d77965b97c21ba74aa2acb302cd8fe0;p=spline3.git

diff --git a/src/Tests/Grid.hs b/src/Tests/Grid.hs
index 750cff8..f94a519 100644
--- a/src/Tests/Grid.hs
+++ b/src/Tests/Grid.hs
@@ -1,24 +1,17 @@
 module Tests.Grid
 where
 
-import Data.Maybe (fromJust)
 import Test.HUnit
-import Test.QuickCheck
 
 import Assertions
 import Comparisons
-import Cube
+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
@@ -29,7 +22,7 @@ test_trilinear_c0030 =
     assertAlmostEqual "c0030 is correct" (c t 0 0 3 0) (17/8)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -41,7 +34,7 @@ test_trilinear_c0003 =
     assertAlmostEqual "c0003 is correct" (c t 0 0 0 3) (27/8)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -53,7 +46,7 @@ test_trilinear_c0021 =
     assertAlmostEqual "c0021 is correct" (c t 0 0 2 1) (61/24)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -65,7 +58,7 @@ test_trilinear_c0012 =
     assertAlmostEqual "c0012 is correct" (c t 0 0 1 2) (71/24)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -77,7 +70,7 @@ test_trilinear_c0120 =
     assertAlmostEqual "c0120 is correct" (c t 0 1 2 0) (55/24)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -89,7 +82,7 @@ test_trilinear_c0102 =
     assertAlmostEqual "c0102 is correct" (c t 0 1 0 2) (73/24)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -101,7 +94,7 @@ test_trilinear_c0111 =
     assertAlmostEqual "c0111 is correct" (c t 0 1 1 1) (8/3)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -113,7 +106,7 @@ test_trilinear_c0210 =
     assertAlmostEqual "c0210 is correct" (c t 0 2 1 0) (29/12)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -125,7 +118,7 @@ test_trilinear_c0201 =
     assertAlmostEqual "c0201 is correct" (c t 0 2 0 1) (11/4)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -137,7 +130,7 @@ test_trilinear_c0300 =
     assertAlmostEqual "c0300 is correct" (c t 0 3 0 0) (5/2)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -149,7 +142,7 @@ test_trilinear_c1020 =
     assertAlmostEqual "c1020 is correct" (c t 1 0 2 0) (8/3)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -161,7 +154,7 @@ test_trilinear_c1002 =
     assertAlmostEqual "c1002 is correct" (c t 1 0 0 2) (23/6)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -173,7 +166,7 @@ test_trilinear_c1011 =
     assertAlmostEqual "c1011 is correct" (c t 1 0 1 1) (13/4)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -185,7 +178,7 @@ test_trilinear_c1110 =
     assertAlmostEqual "c1110 is correct" (c t 1 1 1 0) (23/8)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -197,7 +190,7 @@ test_trilinear_c1101 =
     assertAlmostEqual "c1101 is correct" (c t 1 1 0 1) (27/8)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -209,7 +202,7 @@ test_trilinear_c1200 =
     assertAlmostEqual "c1200 is correct" (c t 1 2 0 0) 3
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -221,7 +214,7 @@ test_trilinear_c2010 =
     assertAlmostEqual "c2010 is correct" (c t 2 0 1 0) (10/3)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -233,7 +226,7 @@ test_trilinear_c2001 =
     assertAlmostEqual "c2001 is correct" (c t 2 0 0 1) 4
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -245,7 +238,7 @@ test_trilinear_c2100 =
     assertAlmostEqual "c2100 is correct" (c t 2 1 0 0) (7/2)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -257,7 +250,7 @@ test_trilinear_c3000 =
     assertAlmostEqual "c3000 is correct" (c t 3 0 0 0) 4
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -269,7 +262,7 @@ test_trilinear_f0_t0_v0 =
     assertEqual "v0 is correct" (v0 t) (1, 1, 1)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -281,7 +274,7 @@ test_trilinear_f0_t0_v1 =
     assertEqual "v1 is correct" (v1 t) (0.5, 1, 1)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -293,7 +286,7 @@ test_trilinear_f0_t0_v2 =
     assertEqual "v2 is correct" (v2 t) (0.5, 0.5, 1.5)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -305,7 +298,7 @@ test_trilinear_f0_t0_v3 =
     assertClose "v3 is correct" (v3 t) (0.5, 1.5, 1.5)
       where
         g = make_grid 1 trilinear
-        cube = fromJust $ cube_at g 1 1 1
+        cube = cube_at g 1 1 1
         t = tetrahedron0 cube
 
 
@@ -316,14 +309,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
+      c0 = cube_at g 1 1 1
 
 
 test_zeros_reproduced :: Assertion
@@ -338,6 +331,44 @@ test_zeros_reproduced =
                       let k' = fromIntegral k]
     where
       g = make_grid 1 zeros
-      c0 = fromJust $ cube_at g 1 1 1
+      c0 = 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 = 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 (tetrahedron15 c) p
+--   -3.4694469519536365e-18
+--
+test_tetrahedra_collision_sensitivity :: Assertion
+test_tetrahedra_collision_sensitivity =
+  assertTrue "tetrahedron collision tests isn't too sensitive" $
+             contains_point t15 p
+  where
+    g = make_grid 1 naturals_1d
+    c = cube_at g 0 17 1
+    p = (0, 16.75, 0.5) :: Point
+    t15 = tetrahedron15 c