Rename "trilinearx2" to "trilinear9x9x9".

[spline3.git] / src / Tests / Grid.hs

diff --git a/src/Tests/Grid.hs b/src/Tests/Grid.hs
index b50d0c1cacd9cd7f12b81c8ebca8a46591e32207..6a30cc59f0038a8f40afb3add71806f1ae3a4259 100644 (file)
--- 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
@@ -14,13 +13,6 @@ import Grid
 import Tetrahedron
 
 
-instance Arbitrary Grid where
-    arbitrary = do
-      (Positive h') <- arbitrary :: Gen (Positive Double)
-      fvs <- arbitrary :: Gen [[[Double]]]
-      return (make_grid h' fvs)
-
-
 -- | Check the value of c0030 for tetrahedron0 belonging to the
 --   cube centered on (1,1,1) with a grid constructed from the
 --   trilinear values. See example one in the paper.
@@ -316,14 +308,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 +333,23 @@ 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
+      t0 = tetrahedron0 c0
+      p = polynomial t0