From 5a21d504c18c0fa28d17286c0c5c9e7929d7f59e Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 5 Sep 2011 18:55:36 -0400 Subject: [PATCH] Update the Cube tests to match the new code. --- src/Tests/Cube.hs | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/src/Tests/Cube.hs b/src/Tests/Cube.hs index 92559e3..2fd8cb6 100644 --- a/src/Tests/Cube.hs +++ b/src/Tests/Cube.hs @@ -14,25 +14,29 @@ import Tetrahedron (b0, b1, b2, b3, c, fv, -- Quickcheck tests. --- | The 'front_half_tetrahedra' and 'back_half_tetrahedra' should --- have no tetrahedra in common. -prop_front_back_tetrahedra_disjoint :: Cube -> Bool -prop_front_back_tetrahedra_disjoint c = - disjoint (front_half_tetrahedra c) (back_half_tetrahedra c) +prop_opposite_octant_tetrahedra_disjoint1 :: Cube -> Bool +prop_opposite_octant_tetrahedra_disjoint1 c = + disjoint (front_left_top_tetrahedra c) (front_right_down_tetrahedra c) +prop_opposite_octant_tetrahedra_disjoint2 :: Cube -> Bool +prop_opposite_octant_tetrahedra_disjoint2 c = + disjoint (back_left_top_tetrahedra c) (back_right_down_tetrahedra c) --- | The 'top_half_tetrahedra' and 'down_half_tetrahedra' should --- have no tetrahedra in common. -prop_top_down_tetrahedra_disjoint :: Cube -> Bool -prop_top_down_tetrahedra_disjoint c = - disjoint (top_half_tetrahedra c) (down_half_tetrahedra c) +prop_opposite_octant_tetrahedra_disjoint3 :: Cube -> Bool +prop_opposite_octant_tetrahedra_disjoint3 c = + disjoint (front_left_top_tetrahedra c) (back_right_top_tetrahedra c) +prop_opposite_octant_tetrahedra_disjoint4 :: Cube -> Bool +prop_opposite_octant_tetrahedra_disjoint4 c = + disjoint (front_left_down_tetrahedra c) (back_right_down_tetrahedra c) --- | The 'left_half_tetrahedra' and 'right_half_tetrahedra' should --- have no tetrahedra in common. -prop_left_right_tetrahedra_disjoint :: Cube -> Bool -prop_left_right_tetrahedra_disjoint c = - disjoint (left_half_tetrahedra c) (right_half_tetrahedra c) +prop_opposite_octant_tetrahedra_disjoint5 :: Cube -> Bool +prop_opposite_octant_tetrahedra_disjoint5 c = + disjoint (front_left_top_tetrahedra c) (back_left_down_tetrahedra c) + +prop_opposite_octant_tetrahedra_disjoint6 :: Cube -> Bool +prop_opposite_octant_tetrahedra_disjoint6 c = + disjoint (front_right_top_tetrahedra c) (back_right_down_tetrahedra c) -- | Since the grid size is necessarily positive, all tetrahedra -- 2.43.2