X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=951899f251548450c7739cf3b05eb71df6af344d;hb=633ff9bc54d59dcfdb5e4fe5f6254b1ca5b48924;hp=657994bee4e14e4f70d5dccd9a5fed5b6aa1fb19;hpb=ddc513c5d9051c57796a49df8be6294a0d0da0da;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 657994b..951899f 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -3,12 +3,14 @@ import Test.QuickCheck
 
 import Tests.Cardinal
 import Tests.Cube as TC
+import Tests.FunctionValues
 import Tests.Grid
 import Tests.Misc
 import Tests.Tetrahedron as TT
 
 -- The list of HUnit tests.
-test_suite = TestList (concat [grid_tests,
+test_suite = TestList (concat [function_values_tests,
+                               grid_tests,
                                misc_tests,
                                tetrahedron_tests])
 
@@ -145,6 +147,21 @@ main = do
   putStr "prop_c0120_identity1... "
   quickCheckWith qc_args TC.prop_c0120_identity1
 
+  putStr "prop_c0120_identity2... "
+  quickCheckWith qc_args TC.prop_c0120_identity2
+
+  putStr "prop_c0120_identity3... "
+  quickCheckWith qc_args TC.prop_c0120_identity3
+
+  putStr "prop_c0120_identity4... "
+  quickCheckWith qc_args TC.prop_c0120_identity4
+
+  putStr "prop_c0120_identity5... "
+  quickCheckWith qc_args TC.prop_c0120_identity5
+
+  putStr "prop_c0120_identity6... "
+  quickCheckWith qc_args TC.prop_c0120_identity6
+
   putStr "prop_c0210_identity1... "
   quickCheckWith qc_args TC.prop_c0210_identity1
 
@@ -180,10 +197,7 @@ main = do
   putStr "prop_c2100_identity2... "
   quickCheckWith qc_args TC.prop_c2100_identity2
 
-  putStrLn "\np. 79, (2.8)\n"
-
-  putStr "prop_t0_shares_edge_with_t6... "
-  quickCheckWith qc_args prop_t0_shares_edge_with_t6
+  putStrLn "\np. 79, (2.8)\n"  
 
   putStr "prop_c3000_identity... "
   quickCheckWith qc_args TC.prop_c3000_identity
@@ -223,6 +237,52 @@ main = do
   -- putStr "prop_c0300_identity3... "
   -- quickCheckWith qc_args TF.prop_c0300_identity3
 
+  putStrLn "\nEdge Incidence Tests\n"
+
+  putStr "prop_t0_shares_edge_with_t6... "
+  quickCheckWith qc_args prop_t0_shares_edge_with_t6
+
+  putStr "prop_t0_shares_edge_with_t1... "
+  quickCheckWith qc_args prop_t0_shares_edge_with_t1
+
+  putStr "prop_t0_shares_edge_with_t3... "
+  quickCheckWith qc_args prop_t0_shares_edge_with_t3
+
+  putStr "prop_t1_shares_edge_with_t2... "
+  quickCheckWith qc_args prop_t1_shares_edge_with_t2
+
+  putStr "prop_t1_shares_edge_with_t19... "
+  quickCheckWith qc_args prop_t1_shares_edge_with_t19
+
+  putStr "prop_t2_shares_edge_with_t3... "
+  quickCheckWith qc_args prop_t2_shares_edge_with_t3
+
+  putStr "prop_t2_shares_edge_with_t12... "
+  quickCheckWith qc_args prop_t2_shares_edge_with_t12
+
+  putStr "prop_t3_shares_edge_with_t21... "
+  quickCheckWith qc_args prop_t3_shares_edge_with_t21
+
+  putStr "prop_t4_shares_edge_with_t5... "
+  quickCheckWith qc_args prop_t4_shares_edge_with_t5
+
+  putStr "prop_t4_shares_edge_with_t7... "
+  quickCheckWith qc_args prop_t4_shares_edge_with_t7
+
+  putStr "prop_t4_shares_edge_with_t10... "
+  quickCheckWith qc_args prop_t4_shares_edge_with_t10
+
+  putStr "prop_t5_shares_edge_with_t6... "
+  quickCheckWith qc_args prop_t5_shares_edge_with_t6
+
+  putStr "prop_t5_shares_edge_with_t16... "
+  quickCheckWith qc_args prop_t5_shares_edge_with_t16
+
+  putStr "prop_t6_shares_edge_with_t7... "
+  quickCheckWith qc_args prop_t6_shares_edge_with_t7
+
+  putStr "prop_t7_shares_edge_with_t20... "
+  quickCheckWith qc_args prop_t7_shares_edge_with_t20
 
   putStrLn "\nMisc Tests\n"