Try to re-enable some more tests; fail miserably.

[spline3.git] / test / TestSuite.hs

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 057468bea163da80683cb5abf45ac6fe2b8b658e..ce386dbd754757e36842fa97c46a7102532c61ca 100644 (file)
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -3,12 +3,12 @@ import Test.QuickCheck
 
 import Tests.Cardinal
 import Tests.Cube
-import Tests.Face as TF
+import Tests.Grid
 import Tests.Misc
 import Tests.Tetrahedron as TT
 
 -- The list of HUnit tests.
-test_suite = TestList (concat [face_tests,
+test_suite = TestList (concat [grid_tests,
                                misc_tests,
                                tetrahedron_tests])
 
@@ -24,37 +24,43 @@ main = do
                           maxDiscard = 500,
                           maxSize = 100 }
 
+
+  putStrLn "\nGrid Tests\n"
+
   putStrLn "\nCube Tests\n"
 
+  -- putStr "prop_c0120_identity1... "
+  -- quickCheckWith qc_args prop_c0120_identity1
+
   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
@@ -104,9 +110,39 @@ main = do
   putStr "prop_tetrahedron15_volumes_positive... "
   quickCheckWith qc_args prop_tetrahedron15_volumes_positive
 
+  putStr "prop_tetrahedron16_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron16_volumes_positive
+
+  putStr "prop_tetrahedron17_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron17_volumes_positive
+
+  putStr "prop_tetrahedron18_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron18_volumes_positive
+
+  putStr "prop_tetrahedron19_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron19_volumes_positive
+
+  putStr "prop_tetrahedron20_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron20_volumes_positive
+
+  putStr "prop_tetrahedron21_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron21_volumes_positive
+
+  putStr "prop_tetrahedron22_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron22_volumes_positive
+
+  putStr "prop_tetrahedron23_volumes_positive... "
+  quickCheckWith qc_args prop_tetrahedron23_volumes_positive
+
   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 "\nMisc Tests\n"
 
   putStr "prop_factorial_greater... "
@@ -162,26 +198,19 @@ main = do
   putStr "prop_b3_v2_always_zero... "
   quickCheckWith qc_args prop_b3_v2_always_zero
 
-  -- putStrLn "\np. 78, (2.4)\n"
+  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_c3000_identity... "
+  quickCheckWith qc_args TT.prop_c3000_identity
 
-  -- putStr "prop_c1110_identity... "
-  -- quickCheckWith qc_args TT.prop_c1110_identity
+  putStr "prop_c2100_identity... "
+  quickCheckWith qc_args TT.prop_c2100_identity
 
-  -- putStrLn "\np. 78, (2.5)\n"
+  putStr "prop_c1110_identity... "
+  quickCheckWith qc_args TT.prop_c1110_identity
 
-  -- 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