A bunch more test cleanup.

[spline3.git] / src / Tests / Tetrahedron.hs

diff --git a/src/Tests/Tetrahedron.hs b/src/Tests/Tetrahedron.hs
index 8f838084305df432feaad50f1070bb9c1a2d600b..0d924527e17f8cc601cc9a045a7bf7134ed54b69 100644 (file)
--- a/src/Tests/Tetrahedron.hs
+++ b/src/Tests/Tetrahedron.hs
@@ -9,7 +9,6 @@ import Test.QuickCheck (Property, (==>))
 import Cardinal
 import Comparisons
 import FunctionValues
-import Tests.FunctionValues()
 import Tetrahedron
 import ThreeDimensional
 
@@ -34,7 +33,8 @@ tetrahedron1_geometry_tests =
                       v1 = p1,
                       v2 = p2,
                       v3 = p3,
-                      fv = empty_values }
+                      fv = empty_values,
+                      precomputed_volume = 0 }
 
     volume1 :: Assertion
     volume1 =
@@ -68,7 +68,8 @@ tetrahedron2_geometry_tests =
                       v1 = p1,
                       v2 = p2,
                       v3 = p3,
-                      fv = empty_values }
+                      fv = empty_values,
+                      precomputed_volume = 0 }
 
     volume1 :: Assertion
     volume1 = assertEqual "volume1 is correct" True (vol ~= (1/3))
@@ -106,7 +107,8 @@ containment_tests =
                           v1 = p1,
                           v2 = p2,
                           v3 = p3,
-                          fv = empty_values }
+                          fv = empty_values,
+                          precomputed_volume = 0 }
         contained = contains_point t exterior_point
 
 
@@ -120,7 +122,8 @@ containment_tests =
                           v1 = p1,
                           v2 = p2,
                           v3 = p3,
-                          fv = empty_values }
+                          fv = empty_values,
+                          precomputed_volume = 0 }
         contained = contains_point t exterior_point
 
 
@@ -134,7 +137,8 @@ containment_tests =
                           v1 = p1,
                           v2 = p2,
                           v3 = p3,
-                          fv = empty_values }
+                          fv = empty_values,
+                          precomputed_volume = 0 }
         contained = contains_point t exterior_point
 
 
@@ -148,7 +152,8 @@ containment_tests =
                           v1 = p1,
                           v2 = p2,
                           v3 = p3,
-                          fv = empty_values }
+                          fv = empty_values,
+                          precomputed_volume = 0 }
         contained = contains_point t exterior_point
 
 
@@ -281,62 +286,6 @@ prop_c1110_identity t =
           term3 = (3/4)*((p t 2 1 0 0) + (p t 1 2 0 0) + (p t 2 0 1 0))
           term4 = (3/4)*((p t 1 0 2 0) + (p t 0 2 1 0) + (p t 0 1 2 0))
 
-prop_x_rotation_doesnt_affect_front :: Tetrahedron -> Bool
-prop_x_rotation_doesnt_affect_front t =
-    expr1 == expr2
-    where
-      fv0 = Tetrahedron.fv t
-      fv1 = rotate cwx (Tetrahedron.fv t)
-      expr1 = front fv0
-      expr2 = front fv1
-
-prop_x_rotation_doesnt_affect_back :: Tetrahedron -> Bool
-prop_x_rotation_doesnt_affect_back t =
-    expr1 == expr2
-    where
-      fv0 = Tetrahedron.fv t
-      fv1 = rotate cwx (Tetrahedron.fv t)
-      expr1 = back fv0
-      expr2 = back fv1
-
-
-prop_y_rotation_doesnt_affect_left :: Tetrahedron -> Bool
-prop_y_rotation_doesnt_affect_left t =
-    expr1 == expr2
-    where
-      fv0 = Tetrahedron.fv t
-      fv1 = rotate cwy (Tetrahedron.fv t)
-      expr1 = left fv0
-      expr2 = left fv1
-
-prop_y_rotation_doesnt_affect_right :: Tetrahedron -> Bool
-prop_y_rotation_doesnt_affect_right t =
-    expr1 == expr2
-    where
-      fv0 = Tetrahedron.fv t
-      fv1 = rotate cwy (Tetrahedron.fv t)
-      expr1 = right fv0
-      expr2 = right fv1
-
-
-prop_z_rotation_doesnt_affect_down :: Tetrahedron -> Bool
-prop_z_rotation_doesnt_affect_down t =
-    expr1 == expr2
-    where
-      fv0 = Tetrahedron.fv t
-      fv1 = rotate cwz (Tetrahedron.fv t)
-      expr1 = down fv0
-      expr2 = down fv1
-
-
-prop_z_rotation_doesnt_affect_top :: Tetrahedron -> Bool
-prop_z_rotation_doesnt_affect_top t =
-    expr1 == expr2
-    where
-      fv0 = Tetrahedron.fv t
-      fv1 = rotate cwz (Tetrahedron.fv t)
-      expr1 = top fv0
-      expr2 = top fv1
 
 prop_swapping_vertices_doesnt_affect_coefficients1 :: Tetrahedron -> Bool
 prop_swapping_vertices_doesnt_affect_coefficients1 t =