From: Michael Orlitzky Date: Sun, 8 May 2011 17:02:30 +0000 (-0400) Subject: Move the (2.8) tests from Face to Cube. X-Git-Tag: 0.0.1~309 X-Git-Url: http://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=a32bce2dc24c2371099f0927ac5959c893d025a8;hp=e81be702ecf9a92e2c430d283b16b12987e03b81;p=spline3.git Move the (2.8) tests from Face to Cube. --- diff --git a/src/Tests/Cube.hs b/src/Tests/Cube.hs index 2bdda66..888c48f 100644 --- a/src/Tests/Cube.hs +++ b/src/Tests/Cube.hs @@ -419,6 +419,67 @@ prop_c2100_identity2 cube = t1 = tetrahedron1 cube +prop_t0_shares_edge_with_t6 :: Cube -> Bool +prop_t0_shares_edge_with_t6 cube = + (v2 t0) == (v3 t6) && (v3 t0) == (v2 t6) + where + t0 = tetrahedron0 cube + t6 = tetrahedron6 cube + + +-- | Given in Sorokina and Zeilfelder, p. 79. +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 + + +-- | Given in Sorokina and Zeilfelder, p. 79. +prop_c2010_identity :: Cube -> Bool +prop_c2010_identity cube = + c t0 2 0 1 0 ~= c t0 1 1 1 0 + c t6 1 1 1 0 - ((c t0 1 0 2 0 + c t0 1 0 1 1)/ 2) + where + t0 = tetrahedron0 cube + t6 = tetrahedron6 cube + + +-- | Given in Sorokina and Zeilfelder, p. 79. +prop_c2001_identity :: Cube -> Bool +prop_c2001_identity cube = + c t0 2 0 0 1 ~= c t0 1 1 0 1 + c t6 1 1 0 1 - ((c t0 1 0 0 2 + c t0 1 0 1 1)/ 2) + where + t0 = tetrahedron0 cube + t6 = tetrahedron6 cube + +-- | Given in Sorokina and Zeilfelder, p. 79. +prop_c1020_identity :: Cube -> Bool +prop_c1020_identity cube = + c t0 1 0 2 0 ~= c t0 0 1 2 0 + c t6 0 1 2 0 - ((c t0 0 0 3 0 + c t0 0 0 2 1)/ 2) + where + t0 = tetrahedron0 cube + t6 = tetrahedron6 cube + + +-- | Given in Sorokina and Zeilfelder, p. 79. +prop_c1002_identity :: Cube -> Bool +prop_c1002_identity cube = + c t0 1 0 0 2 ~= c t0 0 1 0 2 + c t6 0 1 0 2 - ((c t0 0 0 0 3 + c t0 0 0 1 2)/ 2) + where + t0 = tetrahedron0 cube + t6 = tetrahedron6 cube + + +-- | Given in Sorokina and Zeilfelder, p. 79. +prop_c1011_identity :: Cube -> Bool +prop_c1011_identity cube = + c t0 1 0 1 1 ~= c t0 0 1 1 1 + c t6 0 1 1 1 - ((c t0 0 0 1 2 + c t0 0 0 2 1)/ 2) + where + t0 = tetrahedron0 cube + t6 = tetrahedron6 cube + + -- | Given in Sorokina and Zeilfelder, p. 78. -- prop_cijk1_identity :: Cube -> Bool diff --git a/src/Tests/Face.hs b/src/Tests/Face.hs index eaf5b43..0c8c906 100644 --- a/src/Tests/Face.hs +++ b/src/Tests/Face.hs @@ -7,69 +7,6 @@ where --- -- | Given in Sorokina and Zeilfelder, p. 79. --- prop_c3000_identity :: Cube -> Bool --- prop_c3000_identity cube = --- c t0' 3 0 0 0 ~= c t0' 2 1 0 0 + c t2' 2 1 0 0 - ((c t0' 2 0 1 0 + c t0' 2 0 0 1)/ 2) --- where --- t0 = tetrahedron0 (face0 cube) --- t2 = tetrahedron2 (face5 cube) --- t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0) --- t2' = Tetrahedron cube (v3 t2) (v2 t2) (v1 t2) (v0 t2) - - --- -- | Given in Sorokina and Zeilfelder, p. 79. --- prop_c2010_identity :: Cube -> Bool --- prop_c2010_identity cube = --- c t0' 2 0 1 0 ~= c t0' 1 1 1 0 + c t2' 1 1 1 0 - ((c t0' 1 0 2 0 + c t0' 1 0 1 1)/ 2) --- where --- t0 = tetrahedron0 (face0 cube) --- t2 = tetrahedron2 (face5 cube) --- t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0) --- t2' = Tetrahedron cube (v3 t2) (v2 t2) (v1 t2) (v0 t2) - - --- -- | Given in Sorokina and Zeilfelder, p. 79. --- prop_c2001_identity :: Cube -> Bool --- prop_c2001_identity cube = --- c t0' 2 0 0 1 ~= c t0' 1 1 0 1 + c t2' 1 1 0 1 - ((c t0' 1 0 0 2 + c t0' 1 0 1 1)/ 2) --- where --- t0 = tetrahedron0 (face0 cube) --- t2 = tetrahedron2 (face5 cube) --- t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0) --- t2' = Tetrahedron cube (v3 t2) (v2 t2) (v1 t2) (v0 t2) - --- -- | Given in Sorokina and Zeilfelder, p. 79. --- prop_c1020_identity :: Cube -> Bool --- prop_c1020_identity cube = --- c t0' 1 0 2 0 ~= c t0' 0 1 2 0 + c t2' 0 1 2 0 - ((c t0' 0 0 3 0 + c t0' 0 0 2 1)/ 2) --- where --- t0 = tetrahedron0 (face0 cube) --- t2 = tetrahedron2 (face5 cube) --- t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0) --- t2' = Tetrahedron cube (v3 t2) (v2 t2) (v1 t2) (v0 t2) - - --- -- | Given in Sorokina and Zeilfelder, p. 79. --- prop_c1002_identity :: Cube -> Bool --- prop_c1002_identity cube = --- c t0' 1 0 0 2 ~= c t0' 0 1 0 2 + c t2' 0 1 0 2 - ((c t0' 0 0 0 3 + c t0' 0 0 1 2)/ 2) --- where --- t0 = tetrahedron0 (face0 cube) --- t2 = tetrahedron2 (face5 cube) --- t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0) --- t2' = Tetrahedron cube (v3 t2) (v2 t2) (v1 t2) (v0 t2) - - --- -- | Given in Sorokina and Zeilfelder, p. 79. --- prop_c1011_identity :: Cube -> Bool --- prop_c1011_identity cube = --- c t0' 1 0 1 1 ~= c t0' 0 1 1 1 + c t2' 0 1 1 1 - ((c t0' 0 0 1 2 + c t0' 0 0 2 1)/ 2) --- where --- t0 = tetrahedron0 (face0 cube) --- t2 = tetrahedron2 (face5 cube) --- t0' = Tetrahedron cube (v3 t0) (v2 t0) (v1 t0) (v0 t0) --- t2' = Tetrahedron cube (v3 t2) (v2 t2) (v1 t2) (v0 t2) -- -- | Given in Sorokina and Zeilfelder, p. 80.