Add the section (2.9) tests.

diff --git a/src/Grid.hs b/src/Grid.hs
index 647ec574f08b5338ce58042f9a54c9d3fcec3ff8..f8fb3310f9ab32cdada246305376ccbf896fb8f2 100644 (file)
--- a/src/Grid.hs
+++ b/src/Grid.hs
@@ -15,8 +15,12 @@ import Test.HUnit
 import Test.Framework (Test, testGroup)
 import Test.Framework.Providers.HUnit (testCase)
 import Test.Framework.Providers.QuickCheck2 (testProperty)
-import Test.QuickCheck (Arbitrary(..), Gen, Positive(..), choose)
-
+import Test.QuickCheck ((==>),
+                        Arbitrary(..),
+                        Gen,
+                        Positive(..),
+                        Property,
+                        choose)
 import Assertions
 import Comparisons
 import Cube (Cube(Cube),
@@ -69,7 +73,7 @@ cube_at g i j k
     | k < 0      = error "k < 0 in cube_at"
     | k >= zsize = error "k >= zsize in cube_at"
     | otherwise = Cube delta i j k fvs' tet_vol
-      where        
+      where
         fvs = function_values g
         (xsize, ysize, zsize) = dims fvs
         fvs' = make_values fvs i j k
@@ -135,11 +139,11 @@ zoom :: Values3D -> ScaleFactor -> Values3D
 zoom v3d scale_factor
     | xsize == 0 || ysize == 0 || zsize == 0 = empty3d
     | otherwise =
-        R.force $ R.unsafeTraverse v3d transExtent (zoom_lookup v3d scale_factor)
+        R.force $ R.unsafeTraverse v3d transExtent f
           where
             (xsize, ysize, zsize) = dims v3d
             transExtent = zoom_shape scale_factor
-
+            f = zoom_lookup v3d scale_factor
 
 
 -- | Check all coefficients of tetrahedron0 belonging to the cube
@@ -382,11 +386,117 @@ prop_cube_indices_never_go_out_of_bounds g =
       idx_z <= zsize - 1
 
 
+-- | Given in Sorokina and Zeilfelder, p. 80, (2.9). Note that the
+--   third and fourth indices of c-t10 have been switched. This is
+--   because we store the triangles oriented such that their volume is
+--   positive. If T and T-tilde share \<v1,v2,v3\> and v0,v0-tilde point
+--   in opposite directions, one of them has to have negative volume!
+prop_c0120_identity :: Grid -> Property
+prop_c0120_identity g =
+  and [xsize >= 3, ysize >= 3, zsize >= 3] ==>
+    c t0 0 1 2 0 ~= (c t0 1 0 2 0 + c t10 1 0 0 2) / 2
+  where
+    fvs = function_values g
+    (xsize, ysize, zsize) = dims fvs
+    cube0 = cube_at g 1 1 1
+    cube1 = cube_at g 0 1 1
+    t0 = tetrahedron cube0 0 -- These two tetrahedra share a face.
+    t10 = tetrahedron cube1 10
+
+
+-- | Given in Sorokina and Zeilfelder, p. 80, (2.9). See
+--   'prop_c0120_identity'.
+prop_c0111_identity :: Grid -> Property
+prop_c0111_identity g =
+  and [xsize >= 3, ysize >= 3, zsize >= 3] ==>
+    c t0 0 1 1 1 ~= (c t0 1 0 1 1 + c t10 1 0 1 1) / 2
+  where
+    fvs = function_values g
+    (xsize, ysize, zsize) = dims fvs
+    cube0 = cube_at g 1 1 1
+    cube1 = cube_at g 0 1 1
+    t0 = tetrahedron cube0 0 -- These two tetrahedra share a face.
+    t10 = tetrahedron cube1 10
+
+
+-- | Given in Sorokina and Zeilfelder, p. 80, (2.9). See
+--   'prop_c0120_identity'.
+prop_c0201_identity :: Grid -> Property
+prop_c0201_identity g =
+  and [xsize >= 3, ysize >= 3, zsize >= 3] ==>
+    c t0 0 2 0 1 ~= (c t0 1 1 0 1 + c t10 1 1 1 0) / 2
+  where
+    fvs = function_values g
+    (xsize, ysize, zsize) = dims fvs
+    cube0 = cube_at g 1 1 1
+    cube1 = cube_at g 0 1 1
+    t0 = tetrahedron cube0 0 -- These two tetrahedra share a face.
+    t10 = tetrahedron cube1 10
+
+
+-- | Given in Sorokina and Zeilfelder, p. 80, (2.9). See
+--   'prop_c0120_identity'.
+prop_c0102_identity :: Grid -> Property
+prop_c0102_identity g =
+  and [xsize >= 3, ysize >= 3, zsize >= 3] ==>
+    c t0 0 1 0 2 ~= (c t0 1 0 0 2 + c t10 1 0 2 0) / 2
+  where
+    fvs = function_values g
+    (xsize, ysize, zsize) = dims fvs
+    cube0 = cube_at g 1 1 1
+    cube1 = cube_at g 0 1 1
+    t0 = tetrahedron cube0 0 -- These two tetrahedra share a face.
+    t10 = tetrahedron cube1 10
+
+
+-- | Given in Sorokina and Zeilfelder, p. 80, (2.9). See
+--   'prop_c0120_identity'.
+prop_c0210_identity :: Grid -> Property
+prop_c0210_identity g =
+  and [xsize >= 3, ysize >= 3, zsize >= 3] ==>
+    c t0 0 2 1 0 ~= (c t0 1 1 1 0 + c t10 1 1 0 1) / 2
+  where
+    fvs = function_values g
+    (xsize, ysize, zsize) = dims fvs
+    cube0 = cube_at g 1 1 1
+    cube1 = cube_at g 0 1 1
+    t0 = tetrahedron cube0 0 -- These two tetrahedra share a face.
+    t10 = tetrahedron cube1 10
+
+
+-- | Given in Sorokina and Zeilfelder, p. 80, (2.9). See
+--   'prop_c0120_identity'.
+prop_c0300_identity :: Grid -> Property
+prop_c0300_identity g =
+  and [xsize >= 3, ysize >= 3, zsize >= 3] ==>
+    c t0 0 3 0 0 ~= (c t0 1 2 0 0 + c t10 1 2 0 0) / 2
+  where
+    fvs = function_values g
+    (xsize, ysize, zsize) = dims fvs
+    cube0 = cube_at g 1 1 1
+    cube1 = cube_at g 0 1 1
+    t0 = tetrahedron cube0 0 -- These two tetrahedra share a face.
+    t10 = tetrahedron cube1 10
+
+
+-- | All of the properties from Section (2.9), p. 80. These require a
+--   grid since they refer to two adjacent cubes.
+p80_29_properties :: Test.Framework.Test
+p80_29_properties =
+  testGroup "p. 80, Section (2.9) Properties" [
+    testProperty "c0120 identity" prop_c0120_identity,
+    testProperty "c0111 identity" prop_c0111_identity,
+    testProperty "c0201 identity" prop_c0201_identity,
+    testProperty "c0102 identity" prop_c0102_identity,
+    testProperty "c0210 identity" prop_c0210_identity,
+    testProperty "c0300 identity" prop_c0300_identity ]
+
 
 grid_tests :: Test.Framework.Test
 grid_tests =
     testGroup "Grid Tests" [
       trilinear_c0_t0_tests,
+      p80_29_properties,
       testCase "tetrahedra collision test isn't too sensitive"
          test_tetrahedra_collision_sensitivity,
       testCase "trilinear reproduced" test_trilinear_reproduced,