Re-enable all of the tests for (2.7).

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

diff --git a/src/Tests/Face.hs b/src/Tests/Face.hs
index 14d000b5130bed57d3150d1556d93b4eadc218a0..eaf5b43a8f5826097fdfca34e41e642f5c6776f0 100644 (file)
--- a/src/Tests/Face.hs
+++ b/src/Tests/Face.hs
@@ -1,19 +1,138 @@
 module Tests.Face
 where
 
-import Test.QuickCheck
-
-import Cube (Cube(grid))
-import Face (tetrahedrons)
-import Grid (Grid(h))
-import Tetrahedron (volume)
-
--- QuickCheck Tests.
-prop_all_volumes_nonnegative :: Cube -> Property
-prop_all_volumes_nonnegative c =
-    (delta > 0) ==> (null negative_volumes)
-    where
-      delta = h (grid c)
-      ts = tetrahedrons c
-      volumes = map volume ts
-      negative_volumes = filter (< 0) volumes
+
+
+
+
+
+
+-- -- | Given in Sorokina and Zeilfelder, p. 79.
+-- prop_c3000_identity :: Cube -> Bool
+-- prop_c3000_identity cube =
+--     c t0' 3 0 0 0 ~= c t0' 2 1 0 0 + c t2' 2 1 0 0 - ((c t0' 2 0 1 0 + c t0' 2 0 0 1)/ 2)
+--       where
+--         t0 = tetrahedron0 (face0 cube)
+--         t2 = tetrahedron2 (face5 cube)
+--         t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0)
+--         t2' = Tetrahedron cube (v3 t2) (v2 t2) (v1 t2) (v0 t2)
+
+
+-- -- | Given in Sorokina and Zeilfelder, p. 79.
+-- prop_c2010_identity :: Cube -> Bool
+-- prop_c2010_identity cube =
+--     c t0' 2 0 1 0 ~= c t0' 1 1 1 0 + c t2' 1 1 1 0 - ((c t0' 1 0 2 0 + c t0' 1 0 1 1)/ 2)
+--       where
+--         t0 = tetrahedron0 (face0 cube)
+--         t2 = tetrahedron2 (face5 cube)
+--         t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0)
+--         t2' = Tetrahedron cube (v3 t2) (v2 t2) (v1 t2) (v0 t2)
+
+
+-- -- | Given in Sorokina and Zeilfelder, p. 79.
+-- prop_c2001_identity :: Cube -> Bool
+-- prop_c2001_identity cube =
+--     c t0' 2 0 0 1 ~= c t0' 1 1 0 1 + c t2' 1 1 0 1 - ((c t0' 1 0 0 2 + c t0' 1 0 1 1)/ 2)
+--       where
+--         t0 = tetrahedron0 (face0 cube)
+--         t2 = tetrahedron2 (face5 cube)
+--         t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0)
+--         t2' = Tetrahedron cube (v3 t2) (v2 t2) (v1 t2) (v0 t2)
+
+-- -- | Given in Sorokina and Zeilfelder, p. 79.
+-- prop_c1020_identity :: Cube -> Bool
+-- prop_c1020_identity cube =
+--     c t0' 1 0 2 0 ~= c t0' 0 1 2 0 + c t2' 0 1 2 0 - ((c t0' 0 0 3 0 + c t0' 0 0 2 1)/ 2)
+--       where
+--         t0 = tetrahedron0 (face0 cube)
+--         t2 = tetrahedron2 (face5 cube)
+--         t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0)
+--         t2' = Tetrahedron cube (v3 t2) (v2 t2) (v1 t2) (v0 t2)
+
+
+-- -- | Given in Sorokina and Zeilfelder, p. 79.
+-- prop_c1002_identity :: Cube -> Bool
+-- prop_c1002_identity cube =
+--     c t0' 1 0 0 2 ~= c t0' 0 1 0 2 + c t2' 0 1 0 2 - ((c t0' 0 0 0 3 + c t0' 0 0 1 2)/ 2)
+--       where
+--         t0 = tetrahedron0 (face0 cube)
+--         t2 = tetrahedron2 (face5 cube)
+--         t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0)
+--         t2' = Tetrahedron cube (v3 t2) (v2 t2) (v1 t2) (v0 t2)
+
+
+-- -- | Given in Sorokina and Zeilfelder, p. 79.
+-- prop_c1011_identity :: Cube -> Bool
+-- prop_c1011_identity cube =
+--     c t0' 1 0 1 1 ~= c t0' 0 1 1 1 + c t2' 0 1 1 1 - ((c t0' 0 0 1 2 + c t0' 0 0 2 1)/ 2)
+--       where
+--         t0 = tetrahedron0 (face0 cube)
+--         t2 = tetrahedron2 (face5 cube)
+--         t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0)
+--         t2' = Tetrahedron cube (v3 t2) (v2 t2) (v1 t2) (v0 t2)
+
+
+-- -- | Given in Sorokina and Zeilfelder, p. 80.
+-- prop_c0120_identity2 :: Cube -> Bool
+-- prop_c0120_identity2 cube =
+--         c t0' 0 1 2 0 ~= (c t0' 1 0 2 0 + c t1' 1 0 2 0) / 2
+--       where
+--         t0 = tetrahedron0 (face0 cube)
+--         t1 = tetrahedron0 (face2 (top cube))
+--         t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0)
+--         t1' = Tetrahedron cube (v3 t1) (v2 t1) (v0 t1) (v1 t1)
+
+
+-- -- | Given in Sorokina and Zeilfelder, p. 80.
+-- prop_c0102_identity2 :: Cube -> Bool
+-- prop_c0102_identity2 cube =
+--     c t0' 0 1 0 2 ~= (c t0' 1 0 0 2 + c t1' 1 0 0 2) / 2
+--       where
+--         t0 = tetrahedron0 (face0 cube)
+--         t1 = tetrahedron0 (face2 (top cube))
+--         t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0)
+--         t1' = Tetrahedron cube (v3 t1) (v2 t1) (v0 t1) (v1 t1)
+
+
+-- -- | Given in Sorokina and Zeilfelder, p. 80.
+-- prop_c0111_identity :: Cube -> Bool
+-- prop_c0111_identity cube =
+--     c t0' 0 1 1 1 ~= (c t0' 1 0 1 1 + c t1' 1 0 1 1) / 2
+--       where
+--         t0 = tetrahedron0 (face0 cube)
+--         t1 = tetrahedron0 (face2 (top cube))
+--         t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0)
+--         t1' = Tetrahedron cube (v3 t1) (v2 t1) (v0 t1) (v1 t1)
+
+
+-- -- | Given in Sorokina and Zeilfelder, p. 80.
+-- prop_c0210_identity2 :: Cube -> Bool
+-- prop_c0210_identity2 cube =
+--     c t0 0 2 1 0 ~= (c t0 1 1 1 0 + c t1 1 1 1 0) / 2
+--       where
+--         t0 = tetrahedron0 (face0 cube)
+--         t1 = tetrahedron0 (face2 (top cube))
+--         t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0)
+--         t1' = Tetrahedron cube (v3 t1) (v2 t1) (v0 t1) (v1 t1)
+
+
+-- -- | Given in Sorokina and Zeilfelder, p. 80.
+-- prop_c0201_identity2 :: Cube -> Bool
+-- prop_c0201_identity2 cube =
+--     c t0 0 2 0 1 ~= (c t0 1 1 0 1 + c t1 1 1 0 1) / 2
+--       where
+--         t0 = tetrahedron0 (face0 cube)
+--         t1 = tetrahedron0 (face2 (top cube))
+--         t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0)
+--         t1' = Tetrahedron cube (v3 t1) (v2 t1) (v0 t1) (v1 t1)
+
+
+-- -- | Given in Sorokina and Zeilfelder, p. 80.
+-- prop_c0300_identity3 :: Cube -> Bool
+-- prop_c0300_identity3 cube =
+--     c t0 0 3 0 0 ~= (c t0 1 2 0 0 + c t1 1 2 0 0) / 2
+--       where
+--         t0 = tetrahedron0 (face0 cube)
+--         t1 = tetrahedron0 (face2 (top cube))
+--         t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0)
+--         t1' = Tetrahedron cube (v3 t1) (v2 t1) (v0 t1) (v1 t1)