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

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 077faa9..657994b 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -2,15 +2,13 @@ import Test.HUnit
 import Test.QuickCheck
 
 import Tests.Cardinal
-import Tests.Cube
-import Tests.Face as TF
-import Tests.Grid as TG
+import Tests.Cube as TC
+import Tests.Grid
 import Tests.Misc
 import Tests.Tetrahedron as TT
 
 -- The list of HUnit tests.
-test_suite = TestList (concat [face_tests,
-                               grid_tests,
+test_suite = TestList (concat [grid_tests,
                                misc_tests,
                                tetrahedron_tests])
 
@@ -34,32 +32,32 @@ main = do
   putStr "prop_all_volumes_positive... "
   quickCheckWith qc_args prop_all_volumes_positive
 
-  putStr "prop_tetrahedron0_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron0_volumes_exact
+  -- putStr "prop_tetrahedron0_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron0_volumes_exact
 
-  putStr "prop_tetrahedron1_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron1_volumes_exact
+  -- putStr "prop_tetrahedron1_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron1_volumes_exact
 
-  putStr "prop_tetrahedron2_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron2_volumes_exact
+  -- putStr "prop_tetrahedron2_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron2_volumes_exact
 
-  putStr "prop_tetrahedron3_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron3_volumes_exact
+  -- putStr "prop_tetrahedron3_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron3_volumes_exact
 
-  putStr "prop_tetrahedron4_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron4_volumes_exact
+  -- putStr "prop_tetrahedron4_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron4_volumes_exact
 
-  putStr "prop_tetrahedron4_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron4_volumes_exact
+  -- putStr "prop_tetrahedron4_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron4_volumes_exact
 
-  putStr "prop_tetrahedron5_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron5_volumes_exact
+  -- putStr "prop_tetrahedron5_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron5_volumes_exact
 
-  putStr "prop_tetrahedron6_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron6_volumes_exact
+  -- putStr "prop_tetrahedron6_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron6_volumes_exact
 
-  putStr "prop_tetrahedron7_volumes_exact... "
-  quickCheckWith qc_args prop_tetrahedron7_volumes_exact
+  -- putStr "prop_tetrahedron7_volumes_exact... "
+  -- quickCheckWith qc_args prop_tetrahedron7_volumes_exact
 
   putStr "prop_tetrahedron0_volumes_positive... "
   quickCheckWith qc_args prop_tetrahedron0_volumes_positive
@@ -136,6 +134,96 @@ main = do
   putStr "prop_v0_all_equal... "
   quickCheckWith qc_args prop_v0_all_equal
 
+  -- putStrLn "\np. 78, (2.5)\n"
+
+  -- putStr "prop_cijk1_identity... "
+  -- quickCheckWith qc_args prop_cijk1_identity
+
+
+  -- putStrLn "\np. 79, (2.6)\n"
+
+  putStr "prop_c0120_identity1... "
+  quickCheckWith qc_args TC.prop_c0120_identity1
+
+  putStr "prop_c0210_identity1... "
+  quickCheckWith qc_args TC.prop_c0210_identity1
+
+  putStr "prop_c0300_identity1... "
+  quickCheckWith qc_args TC.prop_c0300_identity1
+
+  putStr "prop_c1110_identity... "
+  quickCheckWith qc_args TC.prop_c1110_identity
+
+  putStr "prop_c1200_identity1... "
+  quickCheckWith qc_args TC.prop_c1200_identity1
+
+  putStr "prop_c2100_identity1... "
+  quickCheckWith qc_args TC.prop_c2100_identity1
+
+  putStrLn "\np. 79, (2.7)\n"
+
+  putStr "prop_c0102_identity1... "
+  quickCheckWith qc_args TC.prop_c0102_identity1
+
+  putStr "prop_c0201_identity1... "
+  quickCheckWith qc_args TC.prop_c0201_identity1
+
+  putStr "prop_c0300_identity2... "
+  quickCheckWith qc_args TC.prop_c0300_identity2
+
+  putStr "prop_c1101_identity... "
+  quickCheckWith qc_args TC.prop_c1101_identity
+
+  putStr "prop_c1200_identity2... "
+  quickCheckWith qc_args TC.prop_c1200_identity2
+
+  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
+
+  putStr "prop_c3000_identity... "
+  quickCheckWith qc_args TC.prop_c3000_identity
+
+  -- putStr "prop_c2010_identity... "
+  -- quickCheckWith qc_args TC.prop_c2010_identity
+
+  -- putStr "prop_c2001_identity... "
+  -- quickCheckWith qc_args TC.prop_c2001_identity
+
+  -- putStr "prop_c1020_identity... "
+  -- quickCheckWith qc_args TC.prop_c1020_identity
+
+  -- putStr "prop_c1002_identity... "
+  -- quickCheckWith qc_args TC.prop_c1002_identity
+
+  -- putStr "prop_c1011_identity... "
+  -- quickCheckWith qc_args TC.prop_c1011_identity
+
+  -- putStrLn "\np. 80, (2.9)\n"
+
+  -- putStr "prop_c0120_identity2... "
+  -- quickCheckWith qc_args TF.prop_c0120_identity2
+
+  -- putStr "prop_c0102_identity2... "
+  -- quickCheckWith qc_args TF.prop_c0102_identity2
+
+  -- putStr "prop_c0111_identity... "
+  -- quickCheckWith qc_args TF.prop_c0111_identity
+
+  -- putStr "prop_c0210_identity2... "
+  -- quickCheckWith qc_args TF.prop_c0210_identity2
+
+  -- putStr "prop_c0201_identity2... "
+  -- quickCheckWith qc_args TF.prop_c0201_identity2
+
+  -- putStr "prop_c0300_identity3... "
+  -- quickCheckWith qc_args TF.prop_c0300_identity3
+
+
   putStrLn "\nMisc Tests\n"
 
   putStr "prop_factorial_greater... "
@@ -191,108 +279,55 @@ main = do
   putStr "prop_b3_v2_always_zero... "
   quickCheckWith qc_args prop_b3_v2_always_zero
 
-  -- putStrLn "\np. 78, (2.4)\n"
-
-  -- putStr "prop_c3000_identity... "
-  -- quickCheckWith qc_args TT.prop_c3000_identity
-
-  -- putStr "prop_c2100_identity... "
-  -- quickCheckWith qc_args TT.prop_c2100_identity
-
-  -- putStr "prop_c1110_identity... "
-  -- quickCheckWith qc_args TT.prop_c1110_identity
-
-  -- putStrLn "\np. 78, (2.5)\n"
-
-  -- putStr "prop_cijk1_identity... "
-  -- quickCheckWith qc_args prop_cijk1_identity
-  -- putStrLn "\np. 79, (2.6)\n"
-
-  -- putStr "prop_c0120_identity1... "
-  -- quickCheckWith qc_args TF.prop_c0120_identity1
-
-  -- putStr "prop_c0210_identity1... "
-  -- quickCheckWith qc_args TF.prop_c0210_identity1
+  putStrLn "\np. 78, (2.4)\n"
 
-  -- putStr "prop_c0300_identity1... "
-  -- quickCheckWith qc_args TF.prop_c0300_identity1
+  putStr "prop_c3000_identity... "
+  quickCheckWith qc_args TT.prop_c3000_identity
 
-  -- putStr "prop_c1110_identity... "
-  -- quickCheckWith qc_args TF.prop_c1110_identity
+  putStr "prop_c2100_identity... "
+  quickCheckWith qc_args TT.prop_c2100_identity
 
-  -- putStr "prop_c1200_identity1... "
-  -- quickCheckWith qc_args prop_c1200_identity1
+  putStr "prop_c1110_identity... "
+  quickCheckWith qc_args TT.prop_c1110_identity
 
-  -- putStr "prop_c2100_identity1... "
-  -- quickCheckWith qc_args TF.prop_c2100_identity1
-
-  -- putStrLn "\np. 79, (2.7)\n"
-
-  -- putStr "prop_c0102_identity1... "
-  -- quickCheckWith qc_args TF.prop_c0102_identity1
-
-  -- putStr "prop_c0201_identity1... "
-  -- quickCheckWith qc_args TF.prop_c0201_identity1
-
-  -- putStr "prop_c0300_identity2... "
-  -- quickCheckWith qc_args TF.prop_c0300_identity2
-
-  -- putStr "prop_c1101_identity... "
-  -- quickCheckWith qc_args TF.prop_c1101_identity
-
-  -- putStr "prop_c1200_identity2... "
-  -- quickCheckWith qc_args TF.prop_c1200_identity2
-
-  -- putStr "prop_c2100_identity2... "
-  -- quickCheckWith qc_args TF.prop_c2100_identity2
-
-  -- putStrLn "\np. 79, (2.8)\n"
-
-  -- putStr "prop_c3000_identity... "
-  -- quickCheckWith qc_args TF.prop_c3000_identity
-
-  -- putStr "prop_c2010_identity... "
-  -- quickCheckWith qc_args TF.prop_c2010_identity
-
-  -- putStr "prop_c2001_identity... "
-  -- quickCheckWith qc_args TF.prop_c2001_identity
 
-  -- putStr "prop_c1020_identity... "
-  -- quickCheckWith qc_args TF.prop_c1020_identity
+  putStrLn "\nCardinal Tests\n"
 
-  -- putStr "prop_c1002_identity... "
-  -- quickCheckWith qc_args TF.prop_c1002_identity
+  putStr "prop_ccwx_rotation_changes_direction... "
+  quickCheckWith qc_args prop_ccwx_rotation_changes_direction
 
-  -- putStr "prop_c1011_identity... "
-  -- quickCheckWith qc_args TF.prop_c1011_identity
+  putStr "prop_cwx_rotation_changes_direction... "
+  quickCheckWith qc_args prop_cwx_rotation_changes_direction
 
-  -- putStrLn "\np. 80, (2.9)\n"
+  putStr "prop_ccwy_rotation_changes_direction... "
+  quickCheckWith qc_args prop_ccwy_rotation_changes_direction
 
-  -- putStr "prop_c0120_identity2... "
-  -- quickCheckWith qc_args TF.prop_c0120_identity2
+  putStr "prop_cwy_rotation_changes_direction... "
+  quickCheckWith qc_args prop_cwy_rotation_changes_direction
 
-  -- putStr "prop_c0102_identity2... "
-  -- quickCheckWith qc_args TF.prop_c0102_identity2
+  putStr "prop_ccwz_rotation_changes_direction... "
+  quickCheckWith qc_args prop_ccwz_rotation_changes_direction
 
-  -- putStr "prop_c0111_identity... "
-  -- quickCheckWith qc_args TF.prop_c0111_identity
+  putStr "prop_cwz_rotation_changes_direction... "
+  quickCheckWith qc_args prop_cwz_rotation_changes_direction
 
-  -- putStr "prop_c0210_identity2... "
-  -- quickCheckWith qc_args TF.prop_c0210_identity2
+  putStr "prop_ccwx_rotation_result_unique... "
+  quickCheckWith qc_args prop_ccwx_rotation_result_unique
 
-  -- putStr "prop_c0201_identity2... "
-  -- quickCheckWith qc_args TF.prop_c0201_identity2
+  putStr "prop_cwx_rotation_result_unique... "
+  quickCheckWith qc_args prop_cwx_rotation_result_unique
 
-  -- putStr "prop_c0300_identity3... "
-  -- quickCheckWith qc_args TF.prop_c0300_identity3
+  putStr "prop_ccwy_rotation_result_unique... "
+  quickCheckWith qc_args prop_ccwy_rotation_result_unique
 
-  putStrLn "\nCardinal Tests\n"
+  putStr "prop_cwy_rotation_result_unique... "
+  quickCheckWith qc_args prop_cwy_rotation_result_unique
 
-  putStr "prop_ccwx_rotation_changes_direction... "
-  quickCheckWith qc_args prop_ccwx_rotation_changes_direction
+  putStr "prop_ccwz_rotation_result_unique... "
+  quickCheckWith qc_args prop_ccwz_rotation_result_unique
 
-  putStr "prop_cwx_rotation_changes_direction... "
-  quickCheckWith qc_args prop_cwx_rotation_changes_direction
+  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