X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2FTestSuite.hs;h=23bc60394497ca47ea5a10ea2147a9f711ddeb39;hb=248880a645548e5d1910814dd9023e2af80e16ac;hp=a39f5685be3ec0c92ab7d759b010feb5c14f47ff;hpb=19480b63a1835c71b6fd8ecd23c6f0eb915043ae;p=spline3.git

diff --git a/test/TestSuite.hs b/test/TestSuite.hs
index a39f568..23bc603 100644
--- a/test/TestSuite.hs
+++ b/test/TestSuite.hs
@@ -63,7 +63,7 @@ grid_tests =
       tc "trilinear f0_t0_v3" test_trilinear_f0_t0_v3,
       tc "trilinear reproduced" test_trilinear_reproduced,
       tc "zeros reproduced" test_zeros_reproduced,
-      tc "trilinearx2 reproduced (t0)" test_trilinearx2_reproduced_t0 ]
+      tc "trilinear9x9x9 reproduced" test_trilinear9x9x9_reproduced ]
 
 
 misc_tests :: Test.Framework.Test
@@ -189,54 +189,7 @@ cube_properties :: Test.Framework.Test
 cube_properties =
     testGroup "Cube Properties" [
   tp "all volumes positive" prop_all_volumes_positive,
-  tp "tetrahedron0 volumes exact" prop_tetrahedron0_volumes_exact,  
-  tp "tetrahedron1 volumes exact" prop_tetrahedron1_volumes_exact,
-  tp "tetrahedron2 volumes exact" prop_tetrahedron2_volumes_exact,
-  tp "tetrahedron3 volumes exact" prop_tetrahedron3_volumes_exact,
-  tp "tetrahedron4 volumes exact" prop_tetrahedron4_volumes_exact,
-  tp "tetrahedron5 volumes exact" prop_tetrahedron5_volumes_exact,
-  tp "tetrahedron6 volumes exact" prop_tetrahedron6_volumes_exact,
-  tp "tetrahedron7 volumes exact" prop_tetrahedron7_volumes_exact,
-  tp "tetrahedron8 volumes exact" prop_tetrahedron8_volumes_exact,
-  tp "tetrahedron9 volumes exact" prop_tetrahedron9_volumes_exact,
-  tp "tetrahedron10 volumes exact" prop_tetrahedron10_volumes_exact,
-  tp "tetrahedron11 volumes exact" prop_tetrahedron11_volumes_exact,
-  tp "tetrahedron12 volumes exact" prop_tetrahedron12_volumes_exact,
-  tp "tetrahedron13 volumes exact" prop_tetrahedron13_volumes_exact,
-  tp "tetrahedron14 volumes exact" prop_tetrahedron14_volumes_exact,
-  tp "tetrahedron15 volumes exact" prop_tetrahedron15_volumes_exact,
-  tp "tetrahedron16 volumes exact" prop_tetrahedron16_volumes_exact,
-  tp "tetrahedron17 volumes exact" prop_tetrahedron17_volumes_exact,
-  tp "tetrahedron18 volumes exact" prop_tetrahedron18_volumes_exact,
-  tp "tetrahedron19 volumes exact" prop_tetrahedron19_volumes_exact,
-  tp "tetrahedron20 volumes exact" prop_tetrahedron20_volumes_exact,
-  tp "tetrahedron21 volumes exact" prop_tetrahedron21_volumes_exact,
-  tp "tetrahedron22 volumes exact" prop_tetrahedron22_volumes_exact,
-  tp "tetrahedron23 volumes exact" prop_tetrahedron23_volumes_exact,
-  tp "tetrahedron0 volumes positive" prop_tetrahedron0_volumes_positive,
-  tp "tetrahedron1 volumes positive" prop_tetrahedron1_volumes_positive,
-  tp "tetrahedron2 volumes positive" prop_tetrahedron2_volumes_positive,
-  tp "tetrahedron3 volumes positive" prop_tetrahedron3_volumes_positive,
-  tp "tetrahedron4 volumes positive" prop_tetrahedron4_volumes_positive,
-  tp "tetrahedron5 volumes positive" prop_tetrahedron5_volumes_positive,
-  tp "tetrahedron6 volumes positive" prop_tetrahedron6_volumes_positive,
-  tp "tetrahedron7 volumes positive" prop_tetrahedron7_volumes_positive,
-  tp "tetrahedron8 volumes positive" prop_tetrahedron8_volumes_positive,
-  tp "tetrahedron9 volumes positive" prop_tetrahedron9_volumes_positive,
-  tp "tetrahedron10 volumes positive" prop_tetrahedron10_volumes_positive,
-  tp "tetrahedron11 volumes positive" prop_tetrahedron11_volumes_positive,
-  tp "tetrahedron12 volumes positive" prop_tetrahedron12_volumes_positive,
-  tp "tetrahedron13 volumes positive" prop_tetrahedron13_volumes_positive,
-  tp "tetrahedron14 volumes positive" prop_tetrahedron14_volumes_positive,
-  tp "tetrahedron15 volumes positive" prop_tetrahedron15_volumes_positive,
-  tp "tetrahedron16 volumes positive" prop_tetrahedron16_volumes_positive,
-  tp "tetrahedron17 volumes positive" prop_tetrahedron17_volumes_positive,
-  tp "tetrahedron18 volumes positive" prop_tetrahedron18_volumes_positive,
-  tp "tetrahedron19 volumes positive" prop_tetrahedron19_volumes_positive,
-  tp "tetrahedron20 volumes positive" prop_tetrahedron20_volumes_positive,
-  tp "tetrahedron21 volumes positive" prop_tetrahedron21_volumes_positive,
-  tp "tetrahedron22 volumes positive" prop_tetrahedron22_volumes_positive,
-  tp "tetrahedron23 volumes positive" prop_tetrahedron23_volumes_positive,
+  tp "all volumes exact" prop_all_volumes_exact,
   tp "v0 all equal" prop_v0_all_equal,
   tp "interior values all identical" prop_interior_values_all_identical,
   tp "c-tilde_2100 rotation correct" prop_c_tilde_2100_rotation_correct,