X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTests%2FTetrahedron.hs;h=5e176719b7f22f27490f3e5a09c25b18943f18d2;hb=8b5168ee28e4fd1d5958eabeb00fa6ee06bbfe3b;hp=159acd7f95bdb11a4a583c994fcd7a0ed350a2ee;hpb=ea92f7319ba4350715e2397928def15f574d9d8c;p=spline3.git diff --git a/src/Tests/Tetrahedron.hs b/src/Tests/Tetrahedron.hs index 159acd7..5e17671 100644 --- a/src/Tests/Tetrahedron.hs +++ b/src/Tests/Tetrahedron.hs @@ -27,9 +27,9 @@ instance Arbitrary Tetrahedron where -- | Check the volume of a particular tetrahedron against the value -- computed by hand. Its vertices are in clockwise order, so the -- volume should be negative. -test_volume1 :: Test +test_volume1 :: Assertion test_volume1 = - TestCase $ assertEqual "volume is correct" True (vol ~= (-1/3)) + assertEqual "volume is correct" True (vol ~= (-1/3)) where p0 = (0, -0.5, 0) p1 = (0, 0.5, 0) @@ -46,9 +46,9 @@ test_volume1 = -- | Check the volume of a particular tetrahedron against the value -- computed by hand. Its vertices are in counter-clockwise order, so -- the volume should be positive. -test_volume2 :: Test +test_volume2 :: Assertion test_volume2 = - TestCase $ assertEqual "volume is correct" True (vol ~= (1/3)) + assertEqual "volume is correct" True (vol ~= (1/3)) where p0 = (0, -0.5, 0) p1 = (2, 0, 0) @@ -64,9 +64,9 @@ test_volume2 = -- | Ensure that a tetrahedron contains a particular point chosen to -- be inside of it. -test_contains_point1 :: Test +test_contains_point1 :: Assertion test_contains_point1 = - TestCase $ assertEqual "contains an inner point" True (contains_point t inner_point) + assertEqual "contains an inner point" True (contains_point t inner_point) where p0 = (0, -0.5, 0) p1 = (0, 0.5, 0) @@ -82,9 +82,9 @@ test_contains_point1 = -- | Ensure that a tetrahedron does not contain a particular point chosen to -- be outside of it (first test). -test_doesnt_contain_point1 :: Test +test_doesnt_contain_point1 :: Assertion test_doesnt_contain_point1 = - TestCase $ assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point) + assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point) where p0 = (0, -0.5, 0) p1 = (0, 0.5, 0) @@ -100,9 +100,9 @@ test_doesnt_contain_point1 = -- | Ensure that a tetrahedron does not contain a particular point chosen to -- be outside of it (second test). -test_doesnt_contain_point2 :: Test +test_doesnt_contain_point2 :: Assertion test_doesnt_contain_point2 = - TestCase $ assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point) + assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point) where p0 = (0, 1, 1) p1 = (1, 1, 1) @@ -118,9 +118,9 @@ test_doesnt_contain_point2 = -- | Ensure that a tetrahedron does not contain a particular point chosen to -- be outside of it (third test). -test_doesnt_contain_point3 :: Test +test_doesnt_contain_point3 :: Assertion test_doesnt_contain_point3 = - TestCase $ assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point) + assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point) where p0 = (1, 1, 1) p1 = (1, 0, 1) @@ -136,9 +136,9 @@ test_doesnt_contain_point3 = -- | Ensure that a tetrahedron does not contain a particular point chosen to -- be outside of it (fourth test). -test_doesnt_contain_point4 :: Test +test_doesnt_contain_point4 :: Assertion test_doesnt_contain_point4 = - TestCase $ assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point) + assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point) where p0 = (1, 0, 1) p1 = (0, 0, 1) @@ -154,9 +154,9 @@ test_doesnt_contain_point4 = -- | Ensure that a tetrahedron does not contain a particular point chosen to -- be outside of it (fifth test). -test_doesnt_contain_point5 :: Test +test_doesnt_contain_point5 :: Assertion test_doesnt_contain_point5 = - TestCase $ assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point) + assertEqual "doesn't contain an exterior point" False (contains_point t exterior_point) where p0 = (0, 0, 1) p1 = (0, 1, 1) @@ -169,17 +169,6 @@ test_doesnt_contain_point5 = v3 = p3, fv = empty_values } --- | A list of all HUnit tests defined in this module. -tetrahedron_tests :: [Test] -tetrahedron_tests = [test_volume1, - test_volume2, - test_contains_point1, - test_doesnt_contain_point1, - test_doesnt_contain_point2, - test_doesnt_contain_point3, - test_doesnt_contain_point4, - test_doesnt_contain_point5 ] - -- | The barycentric coordinate of v0 with respect to itself should -- be one. @@ -316,8 +305,8 @@ prop_x_rotation_doesnt_affect_front t = where fv0 = Tetrahedron.fv t fv1 = rotate (Tetrahedron.fv t) cwx - expr1 = front $ fv0 - expr2 = front $ fv1 + expr1 = front fv0 + expr2 = front fv1 prop_x_rotation_doesnt_affect_back :: Tetrahedron -> Bool prop_x_rotation_doesnt_affect_back t = @@ -325,8 +314,8 @@ prop_x_rotation_doesnt_affect_back t = where fv0 = Tetrahedron.fv t fv1 = rotate (Tetrahedron.fv t) cwx - expr1 = back $ fv0 - expr2 = back $ fv1 + expr1 = back fv0 + expr2 = back fv1 prop_y_rotation_doesnt_affect_left :: Tetrahedron -> Bool @@ -335,8 +324,8 @@ prop_y_rotation_doesnt_affect_left t = where fv0 = Tetrahedron.fv t fv1 = rotate (Tetrahedron.fv t) cwy - expr1 = left $ fv0 - expr2 = left $ fv1 + expr1 = left fv0 + expr2 = left fv1 prop_y_rotation_doesnt_affect_right :: Tetrahedron -> Bool prop_y_rotation_doesnt_affect_right t = @@ -344,8 +333,8 @@ prop_y_rotation_doesnt_affect_right t = where fv0 = Tetrahedron.fv t fv1 = rotate (Tetrahedron.fv t) cwy - expr1 = right $ fv0 - expr2 = right $ fv1 + expr1 = right fv0 + expr2 = right fv1 prop_z_rotation_doesnt_affect_down :: Tetrahedron -> Bool @@ -354,8 +343,8 @@ prop_z_rotation_doesnt_affect_down t = where fv0 = Tetrahedron.fv t fv1 = rotate (Tetrahedron.fv t) cwz - expr1 = down $ fv0 - expr2 = down $ fv1 + expr1 = down fv0 + expr2 = down fv1 prop_z_rotation_doesnt_affect_top :: Tetrahedron -> Bool @@ -364,5 +353,29 @@ prop_z_rotation_doesnt_affect_top t = where fv0 = Tetrahedron.fv t fv1 = rotate (Tetrahedron.fv t) cwz - expr1 = top $ fv0 - expr2 = top $ fv1 + expr1 = top fv0 + expr2 = top fv1 + +prop_swapping_vertices_doesnt_affect_coefficients1 :: Tetrahedron -> Bool +prop_swapping_vertices_doesnt_affect_coefficients1 t = + c t 0 0 1 2 == c t' 0 0 1 2 + where + t' = t { v0 = (v1 t), v1 = (v0 t) } + +prop_swapping_vertices_doesnt_affect_coefficients2 :: Tetrahedron -> Bool +prop_swapping_vertices_doesnt_affect_coefficients2 t = + c t 0 1 1 1 == c t' 0 1 1 1 + where + t' = t { v2 = (v3 t), v3 = (v2 t) } + +prop_swapping_vertices_doesnt_affect_coefficients3 :: Tetrahedron -> Bool +prop_swapping_vertices_doesnt_affect_coefficients3 t = + c t 2 1 0 0 == c t' 2 1 0 0 + where + t' = t { v2 = (v3 t), v3 = (v2 t) } + +prop_swapping_vertices_doesnt_affect_coefficients4 :: Tetrahedron -> Bool +prop_swapping_vertices_doesnt_affect_coefficients4 t = + c t 2 0 0 1 == c t' 2 0 0 1 + where + t' = t { v0 = (v3 t), v3 = (v0 t) }