From: Michael Orlitzky Date: Thu, 4 Aug 2011 16:46:00 +0000 (-0400) Subject: Fix some property tests now that all of the tetrahedra are defined properly. X-Git-Tag: 0.0.1~247 X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=cc10c04deda3bdf54867a9052b638f0bc4b09fbe;p=spline3.git Fix some property tests now that all of the tetrahedra are defined properly. Re-enable some tests that were failing but now pass. --- diff --git a/src/Tests/Cube.hs b/src/Tests/Cube.hs index b5e771b..150faef 100644 --- a/src/Tests/Cube.hs +++ b/src/Tests/Cube.hs @@ -409,38 +409,42 @@ prop_tetrahedron23_volumes_positive cube = volume (tetrahedron23 cube) > 0 --- | Given in Sorokina and Zeilfelder, p. 79, (2.6). It appears that --- the assumptions in sections (2.6) and (2.7) have been --- switched. From the description, one would expect 'tetrahedron0' --- and 'tetrahedron3' to share face \; however, we have --- to use 'tetrahedron0' and 'tetahedron1' for all of the tests in --- section (2.6). Also note that the third and fourth indices of --- c-t1 have been switched. This is because we store the triangles --- oriented such that their volume is positive. If T and T-tilde --- share \ and v3,v3-tilde point in opposite directions, --- one of them has to have negative volume! +-- | Given in Sorokina and Zeilfelder, p. 79, (2.6). Note that the +-- third and fourth indices of c-t1 have been switched. This is +-- because we store the triangles oriented such that their volume is +-- positive. If T and T-tilde share \ and v3,v3-tilde point +-- in opposite directions, one of them has to have negative volume! prop_c0120_identity1 :: Cube -> Bool prop_c0120_identity1 cube = - c t0 0 1 2 0 ~= (c t0 0 0 2 1 + c t1 0 0 1 2) / 2 + c t0 0 1 2 0 ~= (c t0 0 0 2 1 + c t3 0 0 1 2) / 2 where t0 = tetrahedron0 cube - t1 = tetrahedron1 cube + t3 = tetrahedron3 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.6). Repeats -- 'prop_c0120_identity1' with tetrahedrons 1 and 2. prop_c0120_identity2 :: Cube -> Bool prop_c0120_identity2 cube = - c t1 0 1 2 0 ~= (c t1 0 0 2 1 + c t2 0 0 1 2) / 2 + c t1 0 1 2 0 ~= (c t1 0 0 2 1 + c t0 0 0 1 2) / 2 + where + t0 = tetrahedron0 cube + t1 = tetrahedron1 cube + +-- | Given in Sorokina and Zeilfelder, p. 79, (2.6). Repeats +-- 'prop_c0120_identity1' with tetrahedrons 1 and 2. +prop_c0120_identity3 :: Cube -> Bool +prop_c0120_identity3 cube = + c t2 0 1 2 0 ~= (c t2 0 0 2 1 + c t1 0 0 1 2) / 2 where t1 = tetrahedron1 cube t2 = tetrahedron2 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.6). Repeats -- 'prop_c0120_identity1' with tetrahedrons 2 and 3. -prop_c0120_identity3 :: Cube -> Bool -prop_c0120_identity3 cube = - c t2 0 1 2 0 ~= (c t2 0 0 2 1 + c t3 0 0 1 2) / 2 +prop_c0120_identity4 :: Cube -> Bool +prop_c0120_identity4 cube = + c t3 0 1 2 0 ~= (c t3 0 0 2 1 + c t2 0 0 1 2) / 2 where t2 = tetrahedron2 cube t3 = tetrahedron3 cube @@ -448,176 +452,146 @@ prop_c0120_identity3 cube = -- | Given in Sorokina and Zeilfelder, p. 79, (2.6). Repeats -- 'prop_c0120_identity1' with tetrahedrons 4 and 5. --- prop_c0120_identity4 :: Cube -> Bool --- prop_c0120_identity4 cube = --- sum [trace ("c_t4_0120: " ++ (show tmp1)) tmp1, --- trace ("c_t5_0012: " ++ (show tmp2)) tmp2, --- trace ("c_t5_0102: " ++ (show tmp3)) tmp3, --- trace ("c_t5_1002: " ++ (show tmp4)) tmp4, --- trace ("c_t5_0120: " ++ (show tmp5)) tmp5, --- trace ("c_t5_1020: " ++ (show tmp6)) tmp6, --- trace ("c_t5_1200: " ++ (show tmp7)) tmp7, --- trace ("c_t5_0021: " ++ (show tmp8)) tmp8, --- trace ("c_t5_0201: " ++ (show tmp9)) tmp9, --- trace ("c_t5_2001: " ++ (show tmp10)) tmp10, --- trace ("c_t5_0210: " ++ (show tmp11)) tmp11, --- trace ("c_t5_2010: " ++ (show tmp12)) tmp12, --- trace ("c_t5_2100: " ++ (show tmp13)) tmp13] == 10 --- -- c t4 0 1 2 0 ~= (c t4 0 0 2 1 + c t5 0 0 1 2) / 2 --- where --- t4 = tetrahedron4 cube --- t5 = tetrahedron5 cube --- tmp1 = c t4 0 1 2 0 --- tmp2 = (c t4 0 0 2 1 + c t5 0 0 1 2) / 2 --- tmp3 = (c t4 0 0 2 1 + c t5 0 1 0 2) / 2 --- tmp4 = (c t4 0 0 2 1 + c t5 1 0 0 2) / 2 --- tmp5 = (c t4 0 0 2 1 + c t5 0 1 2 0) / 2 --- tmp6 = (c t4 0 0 2 1 + c t5 1 0 2 0) / 2 --- tmp7 = (c t4 0 0 2 1 + c t5 1 2 0 0) / 2 --- tmp8 = (c t4 0 0 2 1 + c t5 0 0 2 1) / 2 --- tmp9 = (c t4 0 0 2 1 + c t5 0 2 0 1) / 2 --- tmp10 = (c t4 0 0 2 1 + c t5 2 0 0 1) / 2 --- tmp11 = (c t4 0 0 2 1 + c t5 0 2 1 0) / 2 --- tmp12 = (c t4 0 0 2 1 + c t5 2 0 1 0) / 2 --- tmp13 = (c t4 0 0 2 1 + c t5 2 1 0 0) / 2 +prop_c0120_identity5 :: Cube -> Bool +prop_c0120_identity5 cube = + c t5 0 1 2 0 ~= (c t5 0 0 2 1 + c t4 0 0 1 2) / 2 + where + t4 = tetrahedron4 cube + t5 = tetrahedron5 cube -- -- | Given in Sorokina and Zeilfelder, p. 79, (2.6). Repeats -- -- 'prop_c0120_identity1' with tetrahedrons 5 and 6. --- prop_c0120_identity5 :: Cube -> Bool --- prop_c0120_identity5 cube = --- c t5 0 1 2 0 ~= (c t5 0 0 2 1 + c t6 0 0 1 2) / 2 --- where --- t5 = tetrahedron5 cube --- t6 = tetrahedron6 cube +prop_c0120_identity6 :: Cube -> Bool +prop_c0120_identity6 cube = + c t6 0 1 2 0 ~= (c t6 0 0 2 1 + c t5 0 0 1 2) / 2 + where + t5 = tetrahedron5 cube + t6 = tetrahedron6 cube -- -- | Given in Sorokina and Zeilfelder, p. 79, (2.6). Repeats -- -- 'prop_c0120_identity1' with tetrahedrons 6 and 7. --- prop_c0120_identity6 :: Cube -> Bool --- prop_c0120_identity6 cube = --- c t6 0 1 2 0 ~= (c t6 0 0 2 1 + c t7 0 0 1 2) / 2 --- where --- t6 = tetrahedron6 cube --- t7 = tetrahedron7 cube +prop_c0120_identity7 :: Cube -> Bool +prop_c0120_identity7 cube = + c t7 0 1 2 0 ~= (c t7 0 0 2 1 + c t6 0 0 1 2) / 2 + where + t6 = tetrahedron6 cube + t7 = tetrahedron7 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.6). See -- 'prop_c0120_identity1'. prop_c0210_identity1 :: Cube -> Bool prop_c0210_identity1 cube = - c t0 0 2 1 0 ~= (c t0 0 1 1 1 + c t1 0 1 1 1) / 2 + c t0 0 2 1 0 ~= (c t0 0 1 1 1 + c t3 0 1 1 1) / 2 where t0 = tetrahedron0 cube - t1 = tetrahedron1 cube + t3 = tetrahedron3 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.6). See -- 'prop_c0120_identity1'. prop_c0300_identity1 :: Cube -> Bool prop_c0300_identity1 cube = - c t0 0 3 0 0 ~= (c t0 0 2 0 1 + c t1 0 2 1 0) / 2 + c t0 0 3 0 0 ~= (c t0 0 2 0 1 + c t3 0 2 1 0) / 2 where t0 = tetrahedron0 cube - t1 = tetrahedron1 cube + t3 = tetrahedron3 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.6). See -- 'prop_c0120_identity1'. prop_c1110_identity :: Cube -> Bool prop_c1110_identity cube = - c t0 1 1 1 0 ~= (c t0 1 0 1 1 + c t1 1 0 1 1) / 2 + c t0 1 1 1 0 ~= (c t0 1 0 1 1 + c t3 1 0 1 1) / 2 where t0 = tetrahedron0 cube - t1 = tetrahedron1 cube + t3 = tetrahedron3 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.6). See -- 'prop_c0120_identity1'. prop_c1200_identity1 :: Cube -> Bool prop_c1200_identity1 cube = - c t0 1 2 0 0 ~= (c t0 1 1 0 1 + c t1 1 1 1 0) / 2 + c t0 1 2 0 0 ~= (c t0 1 1 0 1 + c t3 1 1 1 0) / 2 where t0 = tetrahedron0 cube - t1 = tetrahedron1 cube + t3 = tetrahedron3 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.6). See -- 'prop_c0120_identity1'. prop_c2100_identity1 :: Cube -> Bool prop_c2100_identity1 cube = - c t0 2 1 0 0 ~= (c t0 2 0 0 1 + c t1 2 0 1 0) / 2 + c t0 2 1 0 0 ~= (c t0 2 0 0 1 + c t3 2 0 1 0) / 2 where t0 = tetrahedron0 cube - t1 = tetrahedron1 cube + t3 = tetrahedron3 cube --- | Given in Sorokina and Zeilfelder, p. 79, (2.7). It appears that --- the assumptions in sections (2.6) and (2.7) have been --- switched. From the description, one would expect 'tetrahedron0' --- and 'tetrahedron1' to share face \; however, we have --- to use 'tetrahedron0' and 'tetahedron3' for all of the tests in --- section (2.7). Also note that the third and fourth indices of --- c-t3 have been switched. This is because we store the triangles --- oriented such that their volume is positive. If T and T-tilde --- share \ and v3,v3-tilde point in opposite directions, --- one of them has to have negative volume! +-- | Given in Sorokina and Zeilfelder, p. 79, (2.7). Note that the +-- third and fourth indices of c-t3 have been switched. This is +-- because we store the triangles oriented such that their volume is +-- positive. If T and T-tilde share \ and v3,v3-tilde +-- point in opposite directions, one of them has to have negative +-- volume! prop_c0102_identity1 :: Cube -> Bool prop_c0102_identity1 cube = - c t0 0 1 0 2 ~= (c t0 0 0 1 2 + c t3 0 0 2 1) / 2 + c t0 0 1 0 2 ~= (c t0 0 0 1 2 + c t1 0 0 2 1) / 2 where t0 = tetrahedron0 cube - t3 = tetrahedron3 cube + t1 = tetrahedron1 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.7). See -- 'prop_c0102_identity1'. prop_c0201_identity1 :: Cube -> Bool prop_c0201_identity1 cube = - c t0 0 2 0 1 ~= (c t0 0 1 1 1 + c t3 0 1 1 1) / 2 + c t0 0 2 0 1 ~= (c t0 0 1 1 1 + c t1 0 1 1 1) / 2 where t0 = tetrahedron0 cube - t3 = tetrahedron3 cube + t1 = tetrahedron1 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.7). See -- 'prop_c0102_identity1'. prop_c0300_identity2 :: Cube -> Bool prop_c0300_identity2 cube = - c t0 0 3 0 0 ~= (c t0 0 2 1 0 + c t3 0 2 0 1) / 2 + c t0 0 3 0 0 ~= (c t0 0 2 1 0 + c t1 0 2 0 1) / 2 where t0 = tetrahedron0 cube - t3 = tetrahedron3 cube + t1 = tetrahedron1 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.7). See -- 'prop_c0102_identity1'. prop_c1101_identity :: Cube -> Bool prop_c1101_identity cube = - c t0 1 1 0 1 ~= (c t0 1 0 1 1 + c t3 1 0 1 1) / 2 + c t0 1 1 0 1 ~= (c t0 1 0 1 1 + c t1 1 0 1 1) / 2 where t0 = tetrahedron0 cube - t3 = tetrahedron3 cube + t1 = tetrahedron1 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.7). See -- 'prop_c0102_identity1'. prop_c1200_identity2 :: Cube -> Bool prop_c1200_identity2 cube = - c t0 1 2 0 0 ~= (c t0 1 1 1 0 + c t3 1 1 0 1) / 2 + c t0 1 2 0 0 ~= (c t0 1 1 1 0 + c t1 1 1 0 1) / 2 where t0 = tetrahedron0 cube - t3 = tetrahedron3 cube + t1 = tetrahedron1 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.7). See -- 'prop_c0102_identity1'. prop_c2100_identity2 :: Cube -> Bool prop_c2100_identity2 cube = - c t0 2 1 0 0 ~= (c t0 2 0 1 0 + c t3 2 0 0 1) / 2 + c t0 2 1 0 0 ~= (c t0 2 0 1 0 + c t1 2 0 0 1) / 2 where t0 = tetrahedron0 cube - t3 = tetrahedron3 cube + t1 = tetrahedron1 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.8). The third and diff --git a/test/TestSuite.hs b/test/TestSuite.hs index f4018af..9dea6bd 100644 --- a/test/TestSuite.hs +++ b/test/TestSuite.hs @@ -142,7 +142,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 +175,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,