X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTests%2FGrid.hs;h=55ca31e4a1455137f42835fdbbaf16e532f686ea;hb=a5e03816d88ef23d30bd81bb9fe2bfefcbfbcec1;hp=15bbc9826e11ca15a6d80c4ed646ca3a2d76a62a;hpb=a97defacc74e0b34c7f12f8a436da39e5124ac10;p=spline3.git

diff --git a/src/Tests/Grid.hs b/src/Tests/Grid.hs
index 15bbc98..55ca31e 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
@@ -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.
@@ -712,3 +704,21 @@ 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_trilinearx2_reproduced_t0 :: Assertion
+test_trilinearx2_reproduced_t0 =
+    assertTrue "trilinearx2 is reproduced correctly" $
+      and [p (i', j', k') ~= value_at trilinearx2 i j k
+            | i <- [0..8],
+              j <- [0..8],
+              k <- [0..8],
+              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