X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=ee6f0d4f797015e233c7196cafd5103a409c51ef;hb=edf374f084fe4e495ea4f5bd87a4646e8559c1d1;hp=0e0055d6142fafc2249c50623b02f09fb73d33da;hpb=5109e41113a39024ef3fe799abb08de4a2ac74b0;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 0e0055d..ee6f0d4 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -3,12 +3,15 @@ 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 [cardinal_tests,
+                               function_values_tests,
+                               grid_tests,
                                misc_tests,
                                tetrahedron_tests])
 
@@ -145,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
 
@@ -160,45 +178,45 @@ main = do
   putStr "prop_c2100_identity1... "
   quickCheckWith qc_args TC.prop_c2100_identity1
 
-  -- putStrLn "\np. 79, (2.7)\n"
+  putStrLn "\np. 79, (2.7)\n"
 
-  -- putStr "prop_c0102_identity1... "
-  -- quickCheckWith qc_args TF.prop_c0102_identity1
+  putStr "prop_c0102_identity1... "
+  quickCheckWith qc_args TC.prop_c0102_identity1
 
-  -- putStr "prop_c0201_identity1... "
-  -- quickCheckWith qc_args TF.prop_c0201_identity1
+  putStr "prop_c0201_identity1... "
+  quickCheckWith qc_args TC.prop_c0201_identity1
 
-  -- putStr "prop_c0300_identity2... "
-  -- quickCheckWith qc_args TF.prop_c0300_identity2
+  putStr "prop_c0300_identity2... "
+  quickCheckWith qc_args TC.prop_c0300_identity2
 
-  -- putStr "prop_c1101_identity... "
-  -- quickCheckWith qc_args TF.prop_c1101_identity
+  putStr "prop_c1101_identity... "
+  quickCheckWith qc_args TC.prop_c1101_identity
 
-  -- putStr "prop_c1200_identity2... "
-  -- quickCheckWith qc_args TF.prop_c1200_identity2
+  putStr "prop_c1200_identity2... "
+  quickCheckWith qc_args TC.prop_c1200_identity2
 
-  -- putStr "prop_c2100_identity2... "
-  -- quickCheckWith qc_args TF.prop_c2100_identity2
+  putStr "prop_c2100_identity2... "
+  quickCheckWith qc_args TC.prop_c2100_identity2
 
-  -- putStrLn "\np. 79, (2.8)\n"
+  putStrLn "\np. 79, (2.8)\n"
 
-  -- putStr "prop_c3000_identity... "
-  -- quickCheckWith qc_args TF.prop_c3000_identity
+  putStr "prop_c3000_identity... "
+  quickCheckWith qc_args TC.prop_c3000_identity
 
   -- putStr "prop_c2010_identity... "
-  -- quickCheckWith qc_args TF.prop_c2010_identity
+  -- quickCheckWith qc_args TC.prop_c2010_identity
 
   -- putStr "prop_c2001_identity... "
-  -- quickCheckWith qc_args TF.prop_c2001_identity
+  -- quickCheckWith qc_args TC.prop_c2001_identity
 
   -- putStr "prop_c1020_identity... "
-  -- quickCheckWith qc_args TF.prop_c1020_identity
+  -- quickCheckWith qc_args TC.prop_c1020_identity
 
   -- putStr "prop_c1002_identity... "
-  -- quickCheckWith qc_args TF.prop_c1002_identity
+  -- quickCheckWith qc_args TC.prop_c1002_identity
 
   -- putStr "prop_c1011_identity... "
-  -- quickCheckWith qc_args TF.prop_c1011_identity
+  -- quickCheckWith qc_args TC.prop_c1011_identity
 
   -- putStrLn "\np. 80, (2.9)\n"
 
@@ -220,6 +238,59 @@ main = do
   -- putStr "prop_c0300_identity3... "
   -- quickCheckWith qc_args TF.prop_c0300_identity3
 
+  putStrLn "prop_c_tilde_2100_rotation_correct... "
+  quickCheckWith qc_args prop_c_tilde_2100_rotation_correct
+
+  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"
 
@@ -296,6 +367,36 @@ main = do
   putStr "prop_cwx_rotation_changes_direction... "
   quickCheckWith qc_args prop_cwx_rotation_changes_direction
 
+  putStr "prop_ccwy_rotation_changes_direction... "
+  quickCheckWith qc_args prop_ccwy_rotation_changes_direction
+
+  putStr "prop_cwy_rotation_changes_direction... "
+  quickCheckWith qc_args prop_cwy_rotation_changes_direction
+
+  putStr "prop_ccwz_rotation_changes_direction... "
+  quickCheckWith qc_args prop_ccwz_rotation_changes_direction
+
+  putStr "prop_cwz_rotation_changes_direction... "
+  quickCheckWith qc_args prop_cwz_rotation_changes_direction
+
+  putStr "prop_ccwx_rotation_result_unique... "
+  quickCheckWith qc_args prop_ccwx_rotation_result_unique
+
+  putStr "prop_cwx_rotation_result_unique... "
+  quickCheckWith qc_args prop_cwx_rotation_result_unique
+
+  putStr "prop_ccwy_rotation_result_unique... "
+  quickCheckWith qc_args prop_ccwy_rotation_result_unique
+
+  putStr "prop_cwy_rotation_result_unique... "
+  quickCheckWith qc_args prop_cwy_rotation_result_unique
+
+  putStr "prop_ccwz_rotation_result_unique... "
+  quickCheckWith qc_args prop_ccwz_rotation_result_unique
+
+  putStr "prop_cwz_rotation_result_unique... "
+  quickCheckWith qc_args prop_cwz_rotation_result_unique
+
   putStr "prop_four_cwx_is_identity... "
   quickCheckWith qc_args prop_four_cwx_is_identity