From 131df3514c868c055c22c090e17674b07d25d8ca Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 4 Jul 2011 12:21:56 -0400 Subject: [PATCH] Add a blank line to the test output. Don't switch v2 and v3 of tetrahedron6 in the (2.8) tests. These tests used to fail, but now they don't. Cool? --- src/Tests/Cube.hs | 15 +++++++-------- test/TestSuite.hs | 2 ++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Tests/Cube.hs b/src/Tests/Cube.hs index 6b11f48..631af5f 100644 --- a/src/Tests/Cube.hs +++ b/src/Tests/Cube.hs @@ -625,15 +625,14 @@ prop_c2100_identity2 cube = -- 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! We also switch the third and fourth vertices of t6, but --- as of now, why this works is a mystery. +-- volume! prop_c3000_identity :: Cube -> Bool prop_c3000_identity cube = c t0 3 0 0 0 ~= c t0 2 1 0 0 + c t6 2 1 0 0 - ((c t0 2 0 1 0 + c t0 2 0 0 1)/ 2) where t0 = tetrahedron0 cube - t6 = (tetrahedron6 cube) { v2 = (v3 t6), v3 = (v2 t6) } + t6 = tetrahedron6 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.8). See @@ -644,7 +643,7 @@ prop_c2010_identity cube = - ((c t0 1 0 2 0 + c t0 1 0 1 1)/ 2) where t0 = tetrahedron0 cube - t6 = (tetrahedron6 cube) { v2 = (v3 t6), v3 = (v2 t6) } + t6 = tetrahedron6 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.8). See @@ -655,7 +654,7 @@ prop_c2001_identity cube = - ((c t0 1 0 0 2 + c t0 1 0 1 1)/ 2) where t0 = tetrahedron0 cube - t6 = (tetrahedron6 cube) { v2 = (v3 t6), v3 = (v2 t6) } + t6 = tetrahedron6 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.8). See @@ -666,7 +665,7 @@ prop_c1020_identity cube = - ((c t0 0 0 3 0 + c t0 0 0 2 1)/ 2) where t0 = tetrahedron0 cube - t6 = (tetrahedron6 cube) { v2 = (v3 t6), v3 = (v2 t6) } + t6 = tetrahedron6 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.8). See @@ -677,7 +676,7 @@ prop_c1002_identity cube = - ((c t0 0 0 0 3 + c t0 0 0 1 2)/ 2) where t0 = tetrahedron0 cube - t6 = (tetrahedron6 cube) { v2 = (v3 t6), v3 = (v2 t6) } + t6 = tetrahedron6 cube -- | Given in Sorokina and Zeilfelder, p. 79, (2.8). See @@ -688,7 +687,7 @@ prop_c1011_identity cube = ((c t0 0 0 1 2 + c t0 0 0 2 1)/ 2) where t0 = tetrahedron0 cube - t6 = (tetrahedron6 cube) { v2 = (v3 t6), v3 = (v2 t6) } + t6 = tetrahedron6 cube diff --git a/test/TestSuite.hs b/test/TestSuite.hs index f97df52..dc348ff 100644 --- a/test/TestSuite.hs +++ b/test/TestSuite.hs @@ -266,6 +266,8 @@ main = do putStr "prop_c1011_identity... " quickCheckWith qc_args TC.prop_c1011_identity + putStr "\n" + -- putStrLn "\np. 80, (2.9)\n" -- putStr "prop_c0120_identity2... " -- 2.43.2