X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=31e24266f9e54b62bc0b4d4935b92072b0088666;hb=a32bce2dc24c2371099f0927ac5959c893d025a8;hp=48493f8d4bb6ce8819243c38dd9aedd3c8e065d6;hpb=1a0cc0a6268fa92f8178d66499840782f25809bd;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index 48493f8..31e2426 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -2,15 +2,13 @@ import Test.HUnit
 import Test.QuickCheck
 
 import Tests.Cardinal
-import Tests.Cube
-import Tests.Face as TF
-import Tests.Grid as TG
+import Tests.Cube as TC
+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])
 
@@ -136,6 +134,93 @@ 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 "\np. 79, (2.6)\n"
+
+  putStr "prop_c0120_identity1... "
+  quickCheckWith qc_args TC.prop_c0120_identity1
+
+  putStr "prop_c0210_identity1... "
+  quickCheckWith qc_args TC.prop_c0210_identity1
+
+  putStr "prop_c0300_identity1... "
+  quickCheckWith qc_args TC.prop_c0300_identity1
+
+  putStr "prop_c1110_identity... "
+  quickCheckWith qc_args TC.prop_c1110_identity
+
+  putStr "prop_c1200_identity1... "
+  quickCheckWith qc_args TC.prop_c1200_identity1
+
+  putStr "prop_c2100_identity1... "
+  quickCheckWith qc_args TC.prop_c2100_identity1
+
+  putStrLn "\np. 79, (2.7)\n"
+
+  putStr "prop_c0102_identity1... "
+  quickCheckWith qc_args TC.prop_c0102_identity1
+
+  putStr "prop_c0201_identity1... "
+  quickCheckWith qc_args TC.prop_c0201_identity1
+
+  putStr "prop_c0300_identity2... "
+  quickCheckWith qc_args TC.prop_c0300_identity2
+
+  putStr "prop_c1101_identity... "
+  quickCheckWith qc_args TC.prop_c1101_identity
+
+  putStr "prop_c1200_identity2... "
+  quickCheckWith qc_args TC.prop_c1200_identity2
+
+  putStr "prop_c2100_identity2... "
+  quickCheckWith qc_args TC.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 "\nMisc Tests\n"
 
   putStr "prop_factorial_greater... "
@@ -191,100 +276,17 @@ 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 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"
+  putStrLn "\np. 78, (2.4)\n"
 
-  -- putStr "prop_c0120_identity2... "
-  -- quickCheckWith qc_args TF.prop_c0120_identity2
+  putStr "prop_c3000_identity... "
+  quickCheckWith qc_args TT.prop_c3000_identity
 
-  -- putStr "prop_c0102_identity2... "
-  -- quickCheckWith qc_args TF.prop_c0102_identity2
+  putStr "prop_c2100_identity... "
+  quickCheckWith qc_args TT.prop_c2100_identity
 
-  -- putStr "prop_c0111_identity... "
-  -- quickCheckWith qc_args TF.prop_c0111_identity
+  putStr "prop_c1110_identity... "
+  quickCheckWith qc_args TT.prop_c1110_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"