X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;ds=sidebyside;f=test%2FTestSuite.hs;h=ac1045bc2d1eab200197ef8b833c1d51380fb0ef;hb=ec2f7ca5bb3b0c41c62812cd725c62e731bb9902;hp=baf1ab11ef3679200cc361c5610890d942325424;hpb=2c2dbf7c58850f3b8294457ca8f4adf9474c7ce7;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index baf1ab1..ac1045b 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -9,7 +9,8 @@ import Tests.Misc
 import Tests.Tetrahedron as TT
 
 -- The list of HUnit tests.
-test_suite = TestList (concat [function_values_tests,
+test_suite = TestList (concat [cardinal_tests,
+                               function_values_tests,
                                grid_tests,
                                misc_tests,
                                tetrahedron_tests])
@@ -147,6 +148,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
 
@@ -184,9 +200,6 @@ main = do
 
   putStrLn "\np. 79, (2.8)\n"
 
-  putStr "prop_t0_shares_edge_with_t6... "
-  quickCheckWith qc_args prop_t0_shares_edge_with_t6
-
   putStr "prop_c3000_identity... "
   quickCheckWith qc_args TC.prop_c3000_identity
 
@@ -225,6 +238,56 @@ main = do
   -- putStr "prop_c0300_identity3... "
   -- quickCheckWith qc_args TF.prop_c0300_identity3
 
+  putStrLn "prop_c_tilde_2100_correct... "
+  quickCheckWith qc_args prop_c_tilde_2100_correct
+
+
+  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"