Fix some warnings and hlint suggestions.

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

diff --git a/src/Tests/Grid.hs b/src/Tests/Grid.hs
index 4f0934953560a061a01a2ab48a45d70fdd122d7e..6fdbb133a6ee70a4b6a6259493b58aee2d8ab939 100644 (file)
--- a/src/Tests/Grid.hs
+++ b/src/Tests/Grid.hs
@@ -6,19 +6,16 @@ import Test.HUnit
 import Test.QuickCheck
 
 import Assertions
-import Comparisons
 import Cube
 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)
+      fvs <- arbitrary :: Gen [[[Double]]]
+      return (make_grid h' fvs)
 
 
 -- | Values of the function f(x,y,z) = 1 + x + xy + xyz taken at nine
@@ -275,6 +272,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 +342,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]