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

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index ce386db..31e2426 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -2,7 +2,7 @@ import Test.HUnit
 import Test.QuickCheck
 
 import Tests.Cardinal
-import Tests.Cube
+import Tests.Cube as TC
 import Tests.Grid
 import Tests.Misc
 import Tests.Tetrahedron as TT
@@ -29,9 +29,6 @@ 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
 
@@ -137,10 +134,91 @@ main = do
   putStr "prop_v0_all_equal... "
   quickCheckWith qc_args prop_v0_all_equal
 
---  putStrLn "\np. 78, (2.5)\n"
+  -- 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_cijk1_identity... "
---  quickCheckWith qc_args prop_cijk1_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"
@@ -209,82 +287,6 @@ main = do
   putStr "prop_c1110_identity... "
   quickCheckWith qc_args TT.prop_c1110_identity
 
-  -- putStrLn "\np. 79, (2.6)\n"
-
-  -- 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"
-
-  -- 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 "\nCardinal Tests\n"