X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=ce386dbd754757e36842fa97c46a7102532c61ca;hb=2064e9a7da32813c6dce843127e2306b841df353;hp=48493f8d4bb6ce8819243c38dd9aedd3c8e065d6;hpb=76ff394c3e5a551e2a6bbf51fbee4e91b90b1611;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 48493f8..ce386db 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -3,14 +3,12 @@ import Test.QuickCheck
 
 import Tests.Cardinal
 import Tests.Cube
-import Tests.Face as TF
-import Tests.Grid as TG
+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])
 
@@ -31,6 +29,9 @@ main = do
 
   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
 
@@ -136,6 +137,12 @@ 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 "\nMisc Tests\n"
 
   putStr "prop_factorial_greater... "
@@ -191,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