X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTests%2FCube.hs;h=26d4d33f5ab7e21f3b85fc032ae98113edd6b25d;hb=2064e9a7da32813c6dce843127e2306b841df353;hp=4a119c26433e3e0b5f7de303267face1006d6de8;hpb=9a3a3a8596fd2b87f19d6d904d564fd1c7fe706f;p=spline3.git

diff --git a/src/Tests/Cube.hs b/src/Tests/Cube.hs
index 4a119c2..26d4d33 100644
--- a/src/Tests/Cube.hs
+++ b/src/Tests/Cube.hs
@@ -1,13 +1,16 @@
 module Tests.Cube
 where
 
+import Debug.Trace (trace)
 import Test.QuickCheck
 
 import Comparisons
 import Cube
-import FunctionValues (FunctionValues(FunctionValues))
-import Tests.FunctionValues
-import Tetrahedron (v0, volume)
+import FunctionValues (FunctionValues)
+import Tests.FunctionValues ()
+import Tetrahedron (b0, b1, b2, b3, c,
+                    Tetrahedron(Tetrahedron),
+                    v0, v1, v2, v3, volume)
 
 instance Arbitrary Cube where
     arbitrary = do
@@ -186,3 +189,103 @@ prop_tetrahedron10_volumes_positive c =
 prop_tetrahedron11_volumes_positive :: Cube -> Bool
 prop_tetrahedron11_volumes_positive c =
     volume (tetrahedron11 c) > 0
+
+-- | This pretty much repeats the prop_all_volumes_positive property,
+--   but will let me know which tetrahedrons's vertices are disoriented.
+prop_tetrahedron12_volumes_positive :: Cube -> Bool
+prop_tetrahedron12_volumes_positive c =
+    volume (tetrahedron12 c) > 0
+
+-- | This pretty much repeats the prop_all_volumes_positive property,
+--   but will let me know which tetrahedrons's vertices are disoriented.
+prop_tetrahedron13_volumes_positive :: Cube -> Bool
+prop_tetrahedron13_volumes_positive c =
+    volume (tetrahedron13 c) > 0
+
+-- | This pretty much repeats the prop_all_volumes_positive property,
+--   but will let me know which tetrahedrons's vertices are disoriented.
+prop_tetrahedron14_volumes_positive :: Cube -> Bool
+prop_tetrahedron14_volumes_positive c =
+    volume (tetrahedron14 c) > 0
+
+-- | This pretty much repeats the prop_all_volumes_positive property,
+--   but will let me know which tetrahedrons's vertices are disoriented.
+prop_tetrahedron15_volumes_positive :: Cube -> Bool
+prop_tetrahedron15_volumes_positive c =
+    volume (tetrahedron15 c) > 0
+
+-- | This pretty much repeats the prop_all_volumes_positive property,
+--   but will let me know which tetrahedrons's vertices are disoriented.
+prop_tetrahedron16_volumes_positive :: Cube -> Bool
+prop_tetrahedron16_volumes_positive c =
+    volume (tetrahedron16 c) > 0
+
+-- | This pretty much repeats the prop_all_volumes_positive property,
+--   but will let me know which tetrahedrons's vertices are disoriented.
+prop_tetrahedron17_volumes_positive :: Cube -> Bool
+prop_tetrahedron17_volumes_positive c =
+    volume (tetrahedron17 c) > 0
+
+-- | This pretty much repeats the prop_all_volumes_positive property,
+--   but will let me know which tetrahedrons's vertices are disoriented.
+prop_tetrahedron18_volumes_positive :: Cube -> Bool
+prop_tetrahedron18_volumes_positive c =
+    volume (tetrahedron18 c) > 0
+
+-- | This pretty much repeats the prop_all_volumes_positive property,
+--   but will let me know which tetrahedrons's vertices are disoriented.
+prop_tetrahedron19_volumes_positive :: Cube -> Bool
+prop_tetrahedron19_volumes_positive c =
+    volume (tetrahedron19 c) > 0
+
+-- | This pretty much repeats the prop_all_volumes_positive property,
+--   but will let me know which tetrahedrons's vertices are disoriented.
+prop_tetrahedron20_volumes_positive :: Cube -> Bool
+prop_tetrahedron20_volumes_positive c =
+    volume (tetrahedron20 c) > 0
+
+-- | This pretty much repeats the prop_all_volumes_positive property,
+--   but will let me know which tetrahedrons's vertices are disoriented.
+prop_tetrahedron21_volumes_positive :: Cube -> Bool
+prop_tetrahedron21_volumes_positive c =
+    volume (tetrahedron21 c) > 0
+
+-- | This pretty much repeats the prop_all_volumes_positive property,
+--   but will let me know which tetrahedrons's vertices are disoriented.
+prop_tetrahedron22_volumes_positive :: Cube -> Bool
+prop_tetrahedron22_volumes_positive c =
+    volume (tetrahedron22 c) > 0
+
+-- | This pretty much repeats the prop_all_volumes_positive property,
+--   but will let me know which tetrahedrons's vertices are disoriented.
+prop_tetrahedron23_volumes_positive :: Cube -> Bool
+prop_tetrahedron23_volumes_positive c =
+    volume (tetrahedron23 c) > 0
+
+
+-- | Given in Sorokina and Zeilfelder, p. 79.
+--prop_c0120_identity1 :: Cube -> Bool
+--prop_c0120_identity1 cube =
+--   c0 ~= (c1 + c2) / 2
+--     where
+--       c0 = trace ("c0 :" ++ (show (c t0 0 1 2 0))) (c t0 0 1 2 0)
+--       c1 = trace ("c1 :" ++ (show (c t0 0 0 2 1))) (c t0 0 0 2 1)
+--       c2 = trace ("c2 :" ++ (show (c t1 0 0 2 1))) (c t1 0 0 2 1)
+--       t0 = tetrahedron0 cube
+--       t1 = tetrahedron1 cube
+
+
+-- | Given in Sorokina and Zeilfelder, p. 78.
+-- prop_cijk1_identity :: Cube -> Bool
+-- prop_cijk1_identity cube =
+--      and [ c t0 i j k 1 ~=
+--                  (c t1 (i+1) j k 0) * ((b0 t0) (v3 t1)) +
+--                  (c t1 i (j+1) k 0) * ((b1 t0) (v3 t1)) +
+--                  (c t1 i j (k+1) 0) * ((b2 t0) (v3 t1)) +
+--                  (c t1 i j k 1) * ((b3 t0) (v3 t1)) | i <- [0..2],
+--                                                       j <- [0..2],
+--                                                       k <- [0..2],
+--                                                       i + j + k == 2]
+--       where
+--         t0 = tetrahedron0 cube
+--         t1 = tetrahedron1 cube