X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;ds=inline;f=test%2FTestSuite.hs;h=a39f5685be3ec0c92ab7d759b010feb5c14f47ff;hb=19480b63a1835c71b6fd8ecd23c6f0eb915043ae;hp=f4018af39d350dd384fe5541141e8981a9a32d64;hpb=4d50411b7c5932c1e1487810aca9460059160042;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index f4018af..a39f568 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -61,31 +61,9 @@ grid_tests =
       tc "trilinear f0_t0_v1" test_trilinear_f0_t0_v1,
       tc "trilinear f0_t0_v2" test_trilinear_f0_t0_v2,
       tc "trilinear f0_t0_v3" test_trilinear_f0_t0_v3,
-      tc "trilinear reproduced (t0)" test_trilinear_reproduced_t0,
-      tc "trilinear reproduced (t1)" test_trilinear_reproduced_t1,
-      tc "trilinear reproduced (t2)" test_trilinear_reproduced_t2,
-      tc "trilinear reproduced (t3)" test_trilinear_reproduced_t3,
-      tc "trilinear reproduced (t4)" test_trilinear_reproduced_t4,
-      tc "trilinear reproduced (t5)" test_trilinear_reproduced_t5,
-      tc "trilinear reproduced (t6)" test_trilinear_reproduced_t6,
-      tc "trilinear reproduced (t7)" test_trilinear_reproduced_t7,
-      tc "trilinear reproduced (t8)" test_trilinear_reproduced_t8,
-      tc "trilinear reproduced (t9)" test_trilinear_reproduced_t9,
-      tc "trilinear reproduced (t10)" test_trilinear_reproduced_t10,
-      tc "trilinear reproduced (t11)" test_trilinear_reproduced_t11,
-      tc "trilinear reproduced (t12)" test_trilinear_reproduced_t12,
-      tc "trilinear reproduced (t13)" test_trilinear_reproduced_t13,
-      tc "trilinear reproduced (t14)" test_trilinear_reproduced_t14,
-      tc "trilinear reproduced (t15)" test_trilinear_reproduced_t15,
-      tc "trilinear reproduced (t16)" test_trilinear_reproduced_t16,
-      tc "trilinear reproduced (t17)" test_trilinear_reproduced_t17,
-      tc "trilinear reproduced (t18)" test_trilinear_reproduced_t18,
-      tc "trilinear reproduced (t19)" test_trilinear_reproduced_t19,
-      tc "trilinear reproduced (t20)" test_trilinear_reproduced_t20,
-      tc "trilinear reproduced (t21)" test_trilinear_reproduced_t21,
-      tc "trilinear reproduced (t22)" test_trilinear_reproduced_t22,
-      tc "trilinear reproduced (t23)" test_trilinear_reproduced_t23,
-      tc "zeros reproduced" test_zeros_reproduced ]
+      tc "trilinear reproduced" test_trilinear_reproduced,
+      tc "zeros reproduced" test_zeros_reproduced,
+      tc "trilinearx2 reproduced (t0)" test_trilinearx2_reproduced_t0 ]
 
 
 misc_tests :: Test.Framework.Test
@@ -142,7 +120,7 @@ p78_24_properties =
     testGroup "p. 78, Section (2.4) Properties" [
       tp "c3000 identity" TT.prop_c3000_identity,
       tp "c2100 identity" TT.prop_c2100_identity,
-      tp "c1110 _identity" TT.prop_c1110_identity]
+      tp "c1110 identity" TT.prop_c1110_identity]
 
 p78_25_properties :: Test.Framework.Test
 p78_25_properties =
@@ -175,12 +153,10 @@ p79_26_properties =
       tp "c0120 identity1" TC.prop_c0120_identity1,
       tp "c0120 identity2" TC.prop_c0120_identity2,
       tp "c0120 identity3" TC.prop_c0120_identity3,
---
--- These repeats of the previous test are failing at the moment.
---
---      tp "c0120 identity4" TC.prop_c0120_identity4,
---      tp "c0120 identity5" TC.prop_c0120_identity5,
---      tp "c0120 identity6" TC.prop_c0120_identity6,
+      tp "c0120 identity4" TC.prop_c0120_identity4,
+      tp "c0120 identity5" TC.prop_c0120_identity5,
+      tp "c0120 identity6" TC.prop_c0120_identity6,
+      tp "c0120 identity7" TC.prop_c0120_identity7,
       tp "c0210 identity1" TC.prop_c0210_identity1,
       tp "c0300 identity1" TC.prop_c0300_identity1,
       tp "c1110 identity" TC.prop_c1110_identity,