X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTests%2FGrid.hs;h=fbe8bc1c6a3821f25438f8087fc257e1a3289b3f;hb=ea92f7319ba4350715e2397928def15f574d9d8c;hp=4f0934953560a061a01a2ab48a45d70fdd122d7e;hpb=62e6ea5912a0ef9b21d034590700d6b450f942fb;p=spline3.git

diff --git a/src/Tests/Grid.hs b/src/Tests/Grid.hs
index 4f09349..fbe8bc1 100644
--- a/src/Tests/Grid.hs
+++ b/src/Tests/Grid.hs
@@ -6,34 +6,18 @@ import Test.HUnit
 import Test.QuickCheck
 
 import Assertions
-import Comparisons
 import Cube
+import Examples
 import Grid
-import Misc
-import Point
 import Tetrahedron
 
 
 instance Arbitrary Grid where
     arbitrary = do
       (Positive h') <- arbitrary :: Gen (Positive Double)
-      fv <- arbitrary :: Gen [[[Double]]]
-      return (make_grid h' fv)
-
-
--- | Values of the function f(x,y,z) = 1 + x + xy + xyz taken at nine
---   points (hi, hj, jk) with h = 1. From example one in the paper.
---   Used in the next bunch of tests.
-trilinear :: [[[Double]]]
-trilinear = [ [ [ 1, 2, 3 ],
-                [ 1, 3, 5 ],
-                [ 1, 4, 7 ] ],
-              [ [ 1, 2, 3 ],
-                [ 1, 4, 7 ],
-                [ 1, 6, 11 ] ],
-              [ [ 1, 2, 3 ],
-                [ 1, 5, 9 ],
-                [ 1, 8, 15 ]]]
+      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
@@ -275,6 +259,54 @@ test_trilinear_c3000 =
         t = tetrahedron0 cube
 
 
+-- | Make sure that v0 of tetrahedron0 belonging to the cube centered
+--   on (1,1,1) with a grid constructed from the trilinear values
+--   winds up in the right place. See example one in the paper.
+test_trilinear_f0_t0_v0 :: Test
+test_trilinear_f0_t0_v0 =
+    TestCase $ assertEqual "v0 is correct" (v0 t) (1, 1, 1)
+      where
+        g = make_grid 1 trilinear
+        cube = fromJust $ cube_at g 1 1 1
+        t = tetrahedron0 cube
+
+
+-- | Make sure that v1 of tetrahedron0 belonging to the cube centered
+--   on (1,1,1) with a grid constructed from the trilinear values
+--   winds up in the right place. See example one in the paper.
+test_trilinear_f0_t0_v1 :: Test
+test_trilinear_f0_t0_v1 =
+    TestCase $ assertEqual "v1 is correct" (v1 t) (0.5, 1, 1)
+      where
+        g = make_grid 1 trilinear
+        cube = fromJust $ cube_at g 1 1 1
+        t = tetrahedron0 cube
+
+
+-- | Make sure that v2 of tetrahedron0 belonging to the cube centered
+--   on (1,1,1) with a grid constructed from the trilinear values
+--   winds up in the right place. See example one in the paper.
+test_trilinear_f0_t0_v2 :: Test
+test_trilinear_f0_t0_v2 =
+    TestCase $ 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
+        t = tetrahedron0 cube
+
+
+-- | Make sure that v3 of tetrahedron0 belonging to the cube centered
+--   on (1,1,1) with a grid constructed from the trilinear values
+--   winds up in the right place. See example one in the paper.
+test_trilinear_f0_t0_v3 :: Test
+test_trilinear_f0_t0_v3 =
+    TestCase $ 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
+        t = tetrahedron0 cube
+
+
 -- | A list of all HUnit tests defined in this module.
 grid_tests :: [Test]
 grid_tests =
@@ -297,4 +329,8 @@ grid_tests =
      test_trilinear_c2010,
      test_trilinear_c2001,
      test_trilinear_c2100,
-     test_trilinear_c3000]
+     test_trilinear_c3000,
+     test_trilinear_f0_t0_v0,
+     test_trilinear_f0_t0_v1,
+     test_trilinear_f0_t0_v2,
+     test_trilinear_f0_t0_v3]