X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=a73480d87205b8201765e08283dad9adefe48dae;hb=1cd046dec9888b04b8687759282880194117736e;hp=26c6bc943d2ac7d5b7fbabbdc5c491cc41023bae;hpb=89b8b6e94fcc944a1f4611811265f3c6217af850;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 26c6bc9..a73480d 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -1,12 +1,15 @@
 import Test.HUnit
 import Test.QuickCheck
 
-import Tests.Face
+import Tests.Cardinal
+import Tests.Cube
+import Tests.Face as TF
 import Tests.Misc
-import Tests.Tetrahedron
+import Tests.Tetrahedron as TT
 
 -- The list of HUnit tests.
-test_suite = TestList (concat [misc_tests,
+test_suite = TestList (concat [face_tests,
+                               misc_tests,
                                tetrahedron_tests])
 
 main :: IO ()
@@ -17,16 +20,88 @@ main = do
   putStrLn ""
   putStrLn "QuickCheck"
   putStrLn "----------"
-  let qc_args = stdArgs { maxSuccess = 1000,
-                          maxDiscard = 5000,
-                          maxSize = 1000 }
+  let qc_args = stdArgs { maxSuccess = 100,
+                          maxDiscard = 500,
+                          maxSize = 100 }
 
-  putStr "prop_all_volumes_nonnegative... "
-  quickCheckWith qc_args prop_all_volumes_nonnegative
+  putStrLn "\nCube Tests\n"
+
+  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_tetrahedron1_volumes_exact... "
+  quickCheckWith qc_args prop_tetrahedron1_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_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_tetrahedron6_volumes_exact... "
+  quickCheckWith qc_args prop_tetrahedron6_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
+
+  putStr "prop_tetrahedron1_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron1_volumes_positive
+
+  putStr "prop_tetrahedron2_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron2_volumes_positive
+
+  putStr "prop_tetrahedron3_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron3_volumes_positive
+
+  putStr "prop_tetrahedron4_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron4_volumes_positive
+
+  putStr "prop_tetrahedron5_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron5_volumes_positive
+
+  putStr "prop_tetrahedron6_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron6_volumes_positive
+
+  putStr "prop_tetrahedron7_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron7_volumes_positive
+
+  putStr "prop_tetrahedron8_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron8_volumes_positive
+
+  putStr "prop_tetrahedron9_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron9_volumes_positive
+
+  putStr "prop_tetrahedron10_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron10_volumes_positive
+
+  putStr "prop_tetrahedron11_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron11_volumes_positive
+
+  putStr "prop_v0_all_equal... "
+  quickCheckWith qc_args prop_v0_all_equal
+
+  putStrLn "\nMisc Tests\n"
 
   putStr "prop_factorial_greater... "
   quickCheckWith qc_args prop_factorial_greater
 
+  putStrLn "\nTetrahedron Tests\n"
+
   putStr "prop_b0_v0_always_unity... "
   quickCheckWith qc_args prop_b0_v0_always_unity
 
@@ -75,13 +150,125 @@ main = do
   putStr "prop_b3_v2_always_zero... "
   quickCheckWith qc_args prop_b3_v2_always_zero
 
-  putStr "prop_c3000_identity... "
-  quickCheckWith qc_args prop_c3000_identity
+  -- 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
+
+  -- putStr "prop_c0300_identity1... "
+  -- quickCheckWith qc_args TF.prop_c0300_identity1
+
+  -- putStr "prop_c1110_identity... "
+  -- quickCheckWith qc_args TF.prop_c1110_identity
+
+  -- putStr "prop_c1200_identity1... "
+  -- quickCheckWith qc_args prop_c1200_identity1
+
+  -- 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
+
+  -- putStr "prop_c1002_identity... "
+  -- quickCheckWith qc_args TF.prop_c1002_identity
+
+  -- putStr "prop_c1011_identity... "
+  -- quickCheckWith qc_args TF.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 "\nCardinal Tests\n"
+
+  putStr "prop_ccwx_rotation_changes_direction... "
+  quickCheckWith qc_args prop_ccwx_rotation_changes_direction
+
+  putStr "prop_cwx_rotation_changes_direction... "
+  quickCheckWith qc_args prop_cwx_rotation_changes_direction
+
+  putStr "prop_four_cwx_is_identity... "
+  quickCheckWith qc_args prop_four_cwx_is_identity
+
+  putStr "prop_four_ccwx_is_identity... "
+  quickCheckWith qc_args prop_four_ccwx_is_identity
+
+  putStr "prop_four_cwy_is_identity... "
+  quickCheckWith qc_args prop_four_cwy_is_identity
+
+  putStr "prop_four_ccwy_is_identity... "
+  quickCheckWith qc_args prop_four_ccwy_is_identity
 
-  putStr "prop_c2100_identity... "
-  quickCheckWith qc_args prop_c2100_identity
+  putStr "prop_four_cwz_is_identity... "
+  quickCheckWith qc_args prop_four_cwz_is_identity
 
-  putStr "prop_c1110_identity... "
-  quickCheckWith qc_args prop_c1110_identity
+  putStr "prop_four_ccwz_is_identity... "
+  quickCheckWith qc_args prop_four_ccwz_is_identity
 
   return ()