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

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 26c6bc9..93236a5 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -1,12 +1,13 @@
 import Test.HUnit
 import Test.QuickCheck
 
-import Tests.Face
+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,12 +18,12 @@ 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
+  putStr "prop_all_volumes_positive... "
+  quickCheckWith qc_args prop_all_volumes_positive
 
   putStr "prop_factorial_greater... "
   quickCheckWith qc_args prop_factorial_greater
@@ -75,13 +76,99 @@ 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 prop_c3000_identity
+  quickCheckWith qc_args TT.prop_c3000_identity
 
   putStr "prop_c2100_identity... "
-  quickCheckWith qc_args 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 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
 
   return ()