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

diff --git a/src/Tests/Grid.hs b/src/Tests/Grid.hs
index b50d0c1..ad7bab9 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.
@@ -309,8 +301,8 @@ test_trilinear_f0_t0_v3 =
         t = tetrahedron0 cube
 
 
-test_trilinear_reproduced :: Assertion
-test_trilinear_reproduced =
+test_trilinear_reproduced_t0 :: Assertion
+test_trilinear_reproduced_t0 =
     assertTrue "trilinears are reproduced correctly" $
              and [p (i', j', k') ~= value_at trilinear i j k
                     | i <- [0..2],
@@ -325,6 +317,377 @@ test_trilinear_reproduced =
       t0 = tetrahedron0 c0
       p = polynomial t0
 
+test_trilinear_reproduced_t1 :: Assertion
+test_trilinear_reproduced_t1 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t1 = tetrahedron1 c0
+      p = polynomial t1
+
+test_trilinear_reproduced_t2 :: Assertion
+test_trilinear_reproduced_t2 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t2 = tetrahedron2 c0
+      p = polynomial t2
+
+test_trilinear_reproduced_t3 :: Assertion
+test_trilinear_reproduced_t3 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t3 = tetrahedron3 c0
+      p = polynomial t3
+
+test_trilinear_reproduced_t4 :: Assertion
+test_trilinear_reproduced_t4 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t4 = tetrahedron4 c0
+      p = polynomial t4
+
+test_trilinear_reproduced_t5 :: Assertion
+test_trilinear_reproduced_t5 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t5 = tetrahedron5 c0
+      p = polynomial t5
+
+test_trilinear_reproduced_t6 :: Assertion
+test_trilinear_reproduced_t6 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t6 = tetrahedron6 c0
+      p = polynomial t6
+
+test_trilinear_reproduced_t7 :: Assertion
+test_trilinear_reproduced_t7 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t7 = tetrahedron7 c0
+      p = polynomial t7
+
+test_trilinear_reproduced_t8 :: Assertion
+test_trilinear_reproduced_t8 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t8 = tetrahedron8 c0
+      p = polynomial t8
+
+test_trilinear_reproduced_t9 :: Assertion
+test_trilinear_reproduced_t9 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t9 = tetrahedron9 c0
+      p = polynomial t9
+
+test_trilinear_reproduced_t10 :: Assertion
+test_trilinear_reproduced_t10 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t10 = tetrahedron10 c0
+      p = polynomial t10
+
+test_trilinear_reproduced_t11 :: Assertion
+test_trilinear_reproduced_t11 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t11 = tetrahedron11 c0
+      p = polynomial t11
+
+test_trilinear_reproduced_t12 :: Assertion
+test_trilinear_reproduced_t12 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t12 = tetrahedron12 c0
+      p = polynomial t12
+
+test_trilinear_reproduced_t13 :: Assertion
+test_trilinear_reproduced_t13 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t13 = tetrahedron13 c0
+      p = polynomial t13
+
+
+test_trilinear_reproduced_t14 :: Assertion
+test_trilinear_reproduced_t14 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t14 = tetrahedron14 c0
+      p = polynomial t14
+
+test_trilinear_reproduced_t15 :: Assertion
+test_trilinear_reproduced_t15 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t15 = tetrahedron15 c0
+      p = polynomial t15
+
+test_trilinear_reproduced_t16 :: Assertion
+test_trilinear_reproduced_t16 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t16 = tetrahedron16 c0
+      p = polynomial t16
+
+test_trilinear_reproduced_t17 :: Assertion
+test_trilinear_reproduced_t17 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t17 = tetrahedron17 c0
+      p = polynomial t17
+
+test_trilinear_reproduced_t18 :: Assertion
+test_trilinear_reproduced_t18 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t18 = tetrahedron18 c0
+      p = polynomial t18
+
+test_trilinear_reproduced_t19 :: Assertion
+test_trilinear_reproduced_t19 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t19 = tetrahedron19 c0
+      p = polynomial t19
+
+test_trilinear_reproduced_t20 :: Assertion
+test_trilinear_reproduced_t20 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t20 = tetrahedron20 c0
+      p = polynomial t20
+
+
+test_trilinear_reproduced_t21 :: Assertion
+test_trilinear_reproduced_t21 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t21 = tetrahedron21 c0
+      p = polynomial t21
+
+test_trilinear_reproduced_t22 :: Assertion
+test_trilinear_reproduced_t22 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t22 = tetrahedron22 c0
+      p = polynomial t22
+
+
+test_trilinear_reproduced_t23 :: Assertion
+test_trilinear_reproduced_t23 =
+    assertTrue "trilinears are reproduced correctly" $
+             and [p (i', j', k') ~= value_at trilinear i j k
+                    | i <- [0..2],
+                      j <- [0..2],
+                      k <- [0..2],
+                      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
+      t19 = tetrahedron19 c0
+      p = polynomial t19
+
 
 test_zeros_reproduced :: Assertion
 test_zeros_reproduced =