X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=057468bea163da80683cb5abf45ac6fe2b8b658e;hb=a73ad12eaff8510ae18ffafdefc0ae928603d5a5;hp=e1255262dce8834cee97d4afc29906fec32d6239;hpb=1b5119ed681268c16c08ee7c9cc7b1766d363a6e;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index e125526..057468b 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -24,68 +24,143 @@ main = do
                           maxDiscard = 500,
                           maxSize = 100 }
 
+  putStrLn "\nCube Tests\n"
+
   putStr "prop_all_volumes_positive... "
   quickCheckWith qc_args prop_all_volumes_positive
 
-  putStr "prop_front_face_volumes_positive... "
-  quickCheckWith qc_args prop_front_face_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_top_face_volumes_positive... "
-  quickCheckWith qc_args prop_top_face_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_tetrahedron12_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron12_volumes_positive
+
+  putStr "prop_tetrahedron13_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron13_volumes_positive
+
+  putStr "prop_tetrahedron14_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron14_volumes_positive
+
+  putStr "prop_tetrahedron15_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron15_volumes_positive
 
   putStr "prop_v0_all_equal... "
   quickCheckWith qc_args prop_v0_all_equal
 
-  -- putStr "prop_factorial_greater... "
-  -- quickCheckWith qc_args prop_factorial_greater
+  putStrLn "\nMisc Tests\n"
+
+  putStr "prop_factorial_greater... "
+  quickCheckWith qc_args prop_factorial_greater
 
-  -- putStr "prop_b0_v0_always_unity... "
-  -- quickCheckWith qc_args prop_b0_v0_always_unity
+  putStrLn "\nTetrahedron Tests\n"
 
-  -- putStr "prop_b0_v1_always_zero... "
-  -- quickCheckWith qc_args prop_b0_v1_always_zero
+  putStr "prop_b0_v0_always_unity... "
+  quickCheckWith qc_args prop_b0_v0_always_unity
 
-  -- putStr "prop_b0_v2_always_zero... "
-  -- quickCheckWith qc_args prop_b0_v2_always_zero
+  putStr "prop_b0_v1_always_zero... "
+  quickCheckWith qc_args prop_b0_v1_always_zero
 
-  -- putStr "prop_b0_v3_always_zero... "
-  -- quickCheckWith qc_args prop_b0_v3_always_zero
+  putStr "prop_b0_v2_always_zero... "
+  quickCheckWith qc_args prop_b0_v2_always_zero
 
-  -- putStr "prop_b1_v1_always_unity... "
-  -- quickCheckWith qc_args prop_b1_v1_always_unity
+  putStr "prop_b0_v3_always_zero... "
+  quickCheckWith qc_args prop_b0_v3_always_zero
 
-  -- putStr "prop_b1_v0_always_zero... "
-  -- quickCheckWith qc_args prop_b1_v0_always_zero
+  putStr "prop_b1_v1_always_unity... "
+  quickCheckWith qc_args prop_b1_v1_always_unity
 
-  -- putStr "prop_b1_v2_always_zero... "
-  -- quickCheckWith qc_args prop_b1_v2_always_zero
+  putStr "prop_b1_v0_always_zero... "
+  quickCheckWith qc_args prop_b1_v0_always_zero
 
-  -- putStr "prop_b1_v3_always_zero... "
-  -- quickCheckWith qc_args prop_b1_v3_always_zero
+  putStr "prop_b1_v2_always_zero... "
+  quickCheckWith qc_args prop_b1_v2_always_zero
 
-  -- putStr "prop_b2_v2_always_unity... "
-  -- quickCheckWith qc_args prop_b2_v2_always_unity
+  putStr "prop_b1_v3_always_zero... "
+  quickCheckWith qc_args prop_b1_v3_always_zero
 
-  -- putStr "prop_b2_v0_always_zero... "
-  -- quickCheckWith qc_args prop_b2_v0_always_zero
+  putStr "prop_b2_v2_always_unity... "
+  quickCheckWith qc_args prop_b2_v2_always_unity
 
-  -- putStr "prop_b2_v1_always_zero... "
-  -- quickCheckWith qc_args prop_b2_v1_always_zero
+  putStr "prop_b2_v0_always_zero... "
+  quickCheckWith qc_args prop_b2_v0_always_zero
 
-  -- putStr "prop_b2_v3_always_zero... "
-  -- quickCheckWith qc_args prop_b2_v3_always_zero
+  putStr "prop_b2_v1_always_zero... "
+  quickCheckWith qc_args prop_b2_v1_always_zero
 
-  -- putStr "prop_b3_v3_always_unity... "
-  -- quickCheckWith qc_args prop_b3_v3_always_unity
+  putStr "prop_b2_v3_always_zero... "
+  quickCheckWith qc_args prop_b2_v3_always_zero
 
-  -- putStr "prop_b3_v0_always_zero... "
-  -- quickCheckWith qc_args prop_b3_v0_always_zero
+  putStr "prop_b3_v3_always_unity... "
+  quickCheckWith qc_args prop_b3_v3_always_unity
 
-  -- putStr "prop_b3_v1_always_zero... "
-  -- quickCheckWith qc_args prop_b3_v1_always_zero
+  putStr "prop_b3_v0_always_zero... "
+  quickCheckWith qc_args prop_b3_v0_always_zero
 
-  -- putStr "prop_b3_v2_always_zero... "
-  -- quickCheckWith qc_args prop_b3_v2_always_zero
+  putStr "prop_b3_v1_always_zero... "
+  quickCheckWith qc_args prop_b3_v1_always_zero
+
+  putStr "prop_b3_v2_always_zero... "
+  quickCheckWith qc_args prop_b3_v2_always_zero
 
   -- putStrLn "\np. 78, (2.4)\n"
 
@@ -182,10 +257,30 @@ main = do
   -- 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_four_cwz_is_identity... "
+  quickCheckWith qc_args prop_four_cwz_is_identity
+
+  putStr "prop_four_ccwz_is_identity... "
+  quickCheckWith qc_args prop_four_ccwz_is_identity
+
   return ()