From a032d4426427de084931d194248f4086b12c11ce Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 10 Jun 2011 14:57:32 -0400 Subject: [PATCH] Add a bunch more exact volume tests. Use the kinda_equals comparison in exact volume tests. --- src/Tests/Cube.hs | 161 +++++++++++++++++++++++++++++++++++++++++++--- test/TestSuite.hs | 108 ++++++++++++++++++++++--------- 2 files changed, 231 insertions(+), 38 deletions(-) diff --git a/src/Tests/Cube.hs b/src/Tests/Cube.hs index dac4f80..11df961 100644 --- a/src/Tests/Cube.hs +++ b/src/Tests/Cube.hs @@ -44,16 +44,17 @@ prop_all_volumes_positive cube = -- we'd expect the volume of each one to be (1/24)*h^3. prop_tetrahedron0_volumes_exact :: Cube -> Bool prop_tetrahedron0_volumes_exact cube = - volume (tetrahedron0 cube) ~= (1/24)*(delta^(3::Int)) + volume (tetrahedron0 cube) ~~= (1/24)*(delta^(3::Int)) where delta = h cube + -- | In fact, since all of the tetrahedra are identical, we should -- already know their volumes. There's 24 tetrahedra to a cube, so -- we'd expect the volume of each one to be (1/24)*h^3. prop_tetrahedron1_volumes_exact :: Cube -> Bool prop_tetrahedron1_volumes_exact cube = - volume (tetrahedron1 cube) ~= (1/24)*(delta^(3::Int)) + volume (tetrahedron1 cube) ~~= (1/24)*(delta^(3::Int)) where delta = h cube @@ -62,7 +63,7 @@ prop_tetrahedron1_volumes_exact cube = -- we'd expect the volume of each one to be (1/24)*h^3. prop_tetrahedron2_volumes_exact :: Cube -> Bool prop_tetrahedron2_volumes_exact cube = - volume (tetrahedron2 cube) ~= (1/24)*(delta^(3::Int)) + volume (tetrahedron2 cube) ~~= (1/24)*(delta^(3::Int)) where delta = h cube @@ -71,7 +72,7 @@ prop_tetrahedron2_volumes_exact cube = -- we'd expect the volume of each one to be (1/24)*h^3. prop_tetrahedron3_volumes_exact :: Cube -> Bool prop_tetrahedron3_volumes_exact cube = - volume (tetrahedron3 cube) ~= (1/24)*(delta^(3::Int)) + volume (tetrahedron3 cube) ~~= (1/24)*(delta^(3::Int)) where delta = h cube @@ -80,7 +81,7 @@ prop_tetrahedron3_volumes_exact cube = -- we'd expect the volume of each one to be (1/24)*h^3. prop_tetrahedron4_volumes_exact :: Cube -> Bool prop_tetrahedron4_volumes_exact cube = - volume (tetrahedron4 cube) ~= (1/24)*(delta^(3::Int)) + volume (tetrahedron4 cube) ~~= (1/24)*(delta^(3::Int)) where delta = h cube @@ -89,7 +90,7 @@ prop_tetrahedron4_volumes_exact cube = -- we'd expect the volume of each one to be (1/24)*h^3. prop_tetrahedron5_volumes_exact :: Cube -> Bool prop_tetrahedron5_volumes_exact cube = - volume (tetrahedron5 cube) ~= (1/24)*(delta^(3::Int)) + volume (tetrahedron5 cube) ~~= (1/24)*(delta^(3::Int)) where delta = h cube @@ -98,7 +99,7 @@ prop_tetrahedron5_volumes_exact cube = -- we'd expect the volume of each one to be (1/24)*h^3. prop_tetrahedron6_volumes_exact :: Cube -> Bool prop_tetrahedron6_volumes_exact cube = - volume (tetrahedron6 cube) ~= (1/24)*(delta^(3::Int)) + volume (tetrahedron6 cube) ~~= (1/24)*(delta^(3::Int)) where delta = h cube @@ -107,7 +108,151 @@ prop_tetrahedron6_volumes_exact cube = -- we'd expect the volume of each one to be (1/24)*h^3. prop_tetrahedron7_volumes_exact :: Cube -> Bool prop_tetrahedron7_volumes_exact cube = - volume (tetrahedron7 cube) ~= (1/24)*(delta^(3::Int)) + volume (tetrahedron7 cube) ~~= (1/24)*(delta^(3::Int)) + where + delta = h cube + +-- | In fact, since all of the tetrahedra are identical, we should +-- already know their volumes. There's 24 tetrahedra to a cube, so +-- we'd expect the volume of each one to be (1/24)*h^3. +prop_tetrahedron8_volumes_exact :: Cube -> Bool +prop_tetrahedron8_volumes_exact cube = + volume (tetrahedron8 cube) ~~= (1/24)*(delta^(3::Int)) + where + delta = h cube + +-- | In fact, since all of the tetrahedra are identical, we should +-- already know their volumes. There's 24 tetrahedra to a cube, so +-- we'd expect the volume of each one to be (1/24)*h^3. +prop_tetrahedron9_volumes_exact :: Cube -> Bool +prop_tetrahedron9_volumes_exact cube = + volume (tetrahedron9 cube) ~~= (1/24)*(delta^(3::Int)) + where + delta = h cube + +-- | In fact, since all of the tetrahedra are identical, we should +-- already know their volumes. There's 24 tetrahedra to a cube, so +-- we'd expect the volume of each one to be (1/24)*h^3. +prop_tetrahedron10_volumes_exact :: Cube -> Bool +prop_tetrahedron10_volumes_exact cube = + volume (tetrahedron10 cube) ~~= (1/24)*(delta^(3::Int)) + where + delta = h cube + +-- | In fact, since all of the tetrahedra are identical, we should +-- already know their volumes. There's 24 tetrahedra to a cube, so +-- we'd expect the volume of each one to be (1/24)*h^3. +prop_tetrahedron11_volumes_exact :: Cube -> Bool +prop_tetrahedron11_volumes_exact cube = + volume (tetrahedron11 cube) ~~= (1/24)*(delta^(3::Int)) + where + delta = h cube + +-- | In fact, since all of the tetrahedra are identical, we should +-- already know their volumes. There's 24 tetrahedra to a cube, so +-- we'd expect the volume of each one to be (1/24)*h^3. +prop_tetrahedron12_volumes_exact :: Cube -> Bool +prop_tetrahedron12_volumes_exact cube = + volume (tetrahedron12 cube) ~~= (1/24)*(delta^(3::Int)) + where + delta = h cube + +-- | In fact, since all of the tetrahedra are identical, we should +-- already know their volumes. There's 24 tetrahedra to a cube, so +-- we'd expect the volume of each one to be (1/24)*h^3. +prop_tetrahedron13_volumes_exact :: Cube -> Bool +prop_tetrahedron13_volumes_exact cube = + volume (tetrahedron13 cube) ~~= (1/24)*(delta^(3::Int)) + where + delta = h cube + +-- | In fact, since all of the tetrahedra are identical, we should +-- already know their volumes. There's 24 tetrahedra to a cube, so +-- we'd expect the volume of each one to be (1/24)*h^3. +prop_tetrahedron14_volumes_exact :: Cube -> Bool +prop_tetrahedron14_volumes_exact cube = + volume (tetrahedron14 cube) ~~= (1/24)*(delta^(3::Int)) + where + delta = h cube + +-- | In fact, since all of the tetrahedra are identical, we should +-- already know their volumes. There's 24 tetrahedra to a cube, so +-- we'd expect the volume of each one to be (1/24)*h^3. +prop_tetrahedron15_volumes_exact :: Cube -> Bool +prop_tetrahedron15_volumes_exact cube = + volume (tetrahedron15 cube) ~~= (1/24)*(delta^(3::Int)) + where + delta = h cube + +-- | In fact, since all of the tetrahedra are identical, we should +-- already know their volumes. There's 24 tetrahedra to a cube, so +-- we'd expect the volume of each one to be (1/24)*h^3. +prop_tetrahedron16_volumes_exact :: Cube -> Bool +prop_tetrahedron16_volumes_exact cube = + volume (tetrahedron16 cube) ~~= (1/24)*(delta^(3::Int)) + where + delta = h cube + +-- | In fact, since all of the tetrahedra are identical, we should +-- already know their volumes. There's 24 tetrahedra to a cube, so +-- we'd expect the volume of each one to be (1/24)*h^3. +prop_tetrahedron17_volumes_exact :: Cube -> Bool +prop_tetrahedron17_volumes_exact cube = + volume (tetrahedron17 cube) ~~= (1/24)*(delta^(3::Int)) + where + delta = h cube + +-- | In fact, since all of the tetrahedra are identical, we should +-- already know their volumes. There's 24 tetrahedra to a cube, so +-- we'd expect the volume of each one to be (1/24)*h^3. +prop_tetrahedron18_volumes_exact :: Cube -> Bool +prop_tetrahedron18_volumes_exact cube = + volume (tetrahedron18 cube) ~~= (1/24)*(delta^(3::Int)) + where + delta = h cube + +-- | In fact, since all of the tetrahedra are identical, we should +-- already know their volumes. There's 24 tetrahedra to a cube, so +-- we'd expect the volume of each one to be (1/24)*h^3. +prop_tetrahedron19_volumes_exact :: Cube -> Bool +prop_tetrahedron19_volumes_exact cube = + volume (tetrahedron19 cube) ~~= (1/24)*(delta^(3::Int)) + where + delta = h cube + +-- | In fact, since all of the tetrahedra are identical, we should +-- already know their volumes. There's 24 tetrahedra to a cube, so +-- we'd expect the volume of each one to be (1/24)*h^3. +prop_tetrahedron20_volumes_exact :: Cube -> Bool +prop_tetrahedron20_volumes_exact cube = + volume (tetrahedron20 cube) ~~= (1/24)*(delta^(3::Int)) + where + delta = h cube + +-- | In fact, since all of the tetrahedra are identical, we should +-- already know their volumes. There's 24 tetrahedra to a cube, so +-- we'd expect the volume of each one to be (1/24)*h^3. +prop_tetrahedron21_volumes_exact :: Cube -> Bool +prop_tetrahedron21_volumes_exact cube = + volume (tetrahedron21 cube) ~~= (1/24)*(delta^(3::Int)) + where + delta = h cube + +-- | In fact, since all of the tetrahedra are identical, we should +-- already know their volumes. There's 24 tetrahedra to a cube, so +-- we'd expect the volume of each one to be (1/24)*h^3. +prop_tetrahedron22_volumes_exact :: Cube -> Bool +prop_tetrahedron22_volumes_exact cube = + volume (tetrahedron22 cube) ~~= (1/24)*(delta^(3::Int)) + where + delta = h cube + +-- | In fact, since all of the tetrahedra are identical, we should +-- already know their volumes. There's 24 tetrahedra to a cube, so +-- we'd expect the volume of each one to be (1/24)*h^3. +prop_tetrahedron23_volumes_exact :: Cube -> Bool +prop_tetrahedron23_volumes_exact cube = + volume (tetrahedron23 cube) ~~= (1/24)*(delta^(3::Int)) where delta = h cube diff --git a/test/TestSuite.hs b/test/TestSuite.hs index e2fe52e..abed470 100644 --- a/test/TestSuite.hs +++ b/test/TestSuite.hs @@ -35,32 +35,80 @@ main = do putStr "prop_all_volumes_positive... " quickCheckWith qc_args prop_all_volumes_positive - -- putStr "prop_tetrahedron0_volumes_exact... " - -- quickCheckWith qc_args prop_tetrahedron0_volumes_exact + putStr "prop_tetrahedron0_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron0_volumes_exact - -- putStr "prop_tetrahedron1_volumes_exact... " - -- quickCheckWith qc_args prop_tetrahedron1_volumes_exact + putStr "prop_tetrahedron1_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron1_volumes_exact - -- putStr "prop_tetrahedron2_volumes_exact... " - -- quickCheckWith qc_args prop_tetrahedron2_volumes_exact + putStr "prop_tetrahedron2_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron2_volumes_exact - -- putStr "prop_tetrahedron3_volumes_exact... " - -- quickCheckWith qc_args prop_tetrahedron3_volumes_exact + putStr "prop_tetrahedron3_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron3_volumes_exact - -- putStr "prop_tetrahedron4_volumes_exact... " - -- quickCheckWith qc_args prop_tetrahedron4_volumes_exact + putStr "prop_tetrahedron4_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron4_volumes_exact - -- putStr "prop_tetrahedron4_volumes_exact... " - -- quickCheckWith qc_args prop_tetrahedron4_volumes_exact + putStr "prop_tetrahedron4_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron4_volumes_exact - -- putStr "prop_tetrahedron5_volumes_exact... " - -- quickCheckWith qc_args prop_tetrahedron5_volumes_exact + putStr "prop_tetrahedron5_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron5_volumes_exact - -- putStr "prop_tetrahedron6_volumes_exact... " - -- quickCheckWith qc_args prop_tetrahedron6_volumes_exact + putStr "prop_tetrahedron6_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron6_volumes_exact - -- putStr "prop_tetrahedron7_volumes_exact... " - -- quickCheckWith qc_args prop_tetrahedron7_volumes_exact + putStr "prop_tetrahedron7_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron7_volumes_exact + + putStr "prop_tetrahedron8_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron8_volumes_exact + + putStr "prop_tetrahedron9_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron9_volumes_exact + + putStr "prop_tetrahedron10_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron10_volumes_exact + + putStr "prop_tetrahedron11_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron11_volumes_exact + + putStr "prop_tetrahedron12_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron12_volumes_exact + + putStr "prop_tetrahedron13_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron13_volumes_exact + + putStr "prop_tetrahedron14_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron14_volumes_exact + + putStr "prop_tetrahedron15_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron15_volumes_exact + + putStr "prop_tetrahedron16_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron16_volumes_exact + + putStr "prop_tetrahedron17_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron17_volumes_exact + + putStr "prop_tetrahedron18_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron18_volumes_exact + + putStr "prop_tetrahedron19_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron19_volumes_exact + + putStr "prop_tetrahedron20_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron20_volumes_exact + + putStr "prop_tetrahedron21_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron21_volumes_exact + + putStr "prop_tetrahedron22_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron22_volumes_exact + + putStr "prop_tetrahedron23_volumes_exact... " + quickCheckWith qc_args prop_tetrahedron23_volumes_exact putStr "prop_tetrahedron0_volumes_positive... " quickCheckWith qc_args prop_tetrahedron0_volumes_positive @@ -143,7 +191,7 @@ main = do -- quickCheckWith qc_args prop_cijk1_identity - -- putStrLn "\np. 79, (2.6)\n" + putStrLn "\np. 79, (2.6)\n" putStr "prop_c0120_identity1... " quickCheckWith qc_args TC.prop_c0120_identity1 @@ -203,22 +251,22 @@ main = do putStr "prop_c3000_identity... " quickCheckWith qc_args TC.prop_c3000_identity - -- putStr "prop_c2010_identity... " - -- quickCheckWith qc_args TC.prop_c2010_identity + putStr "prop_c2010_identity... " + quickCheckWith qc_args TC.prop_c2010_identity - -- putStr "prop_c2001_identity... " - -- quickCheckWith qc_args TC.prop_c2001_identity + putStr "prop_c2001_identity... " + quickCheckWith qc_args TC.prop_c2001_identity - -- putStr "prop_c1020_identity... " - -- quickCheckWith qc_args TC.prop_c1020_identity + putStr "prop_c1020_identity... " + quickCheckWith qc_args TC.prop_c1020_identity - -- putStr "prop_c1002_identity... " - -- quickCheckWith qc_args TC.prop_c1002_identity + putStr "prop_c1002_identity... " + quickCheckWith qc_args TC.prop_c1002_identity - -- putStr "prop_c1011_identity... " - -- quickCheckWith qc_args TC.prop_c1011_identity + putStr "prop_c1011_identity... " + quickCheckWith qc_args TC.prop_c1011_identity - -- putStrLn "\np. 80, (2.9)\n" + putStrLn "\np. 80, (2.9)\n" -- putStr "prop_c0120_identity2... " -- quickCheckWith qc_args TF.prop_c0120_identity2 -- 2.43.2