X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTests%2FCube.hs;h=aaafa7ca77a6cad7f9a6afc4cbab1745d120d611;hb=5973e31fd84d4a91578185f649b3783fdae8a882;hp=0f0e9266307d5aebed409db47b8b173fa6bfe649;hpb=633ff9bc54d59dcfdb5e4fe5f6254b1ca5b48924;p=spline3.git

diff --git a/src/Tests/Cube.hs b/src/Tests/Cube.hs
index 0f0e926..aaafa7c 100644
--- a/src/Tests/Cube.hs
+++ b/src/Tests/Cube.hs
@@ -1,13 +1,15 @@
 module Tests.Cube
 where
 
+import Prelude hiding (LT)
 import Test.QuickCheck
 
+import Cardinal
 import Comparisons
 import Cube
-import FunctionValues (FunctionValues)
+import FunctionValues
 import Tests.FunctionValues ()
-import Tetrahedron (b0, b1, b2, b3, c,
+import Tetrahedron (b0, b1, b2, b3, c, fv,
                     v0, v1, v2, v3, volume)
 
 instance Arbitrary Cube where
@@ -473,7 +475,7 @@ 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
+        t6 = (tetrahedron6 cube) { v2 = (v3 t6), v3 = (v2 t6) }
 
 
 -- | Given in Sorokina and Zeilfelder, p. 79.
@@ -537,6 +539,68 @@ prop_c1011_identity cube =
 --         t1 = tetrahedron1 cube
 
 
+
+-- | We know what (c t6 2 1 0 0) should be from Sorokina and Zeilfelder, p. 87.
+--   This test checks the rotation works as expected.
+prop_c_tilde_2100_rotation_correct :: Cube -> Bool
+prop_c_tilde_2100_rotation_correct cube =
+    expr1 == expr2
+    where
+      t0 = tetrahedron0 cube
+      t6 = tetrahedron6 cube
+
+      -- What gets computed for c2100 of t6.
+      expr1 = eval (Tetrahedron.fv t6) $
+          (3/8)*I +
+          (1/12)*(T + R + L + D) +
+          (1/64)*(FT + FR + FL + FD) +
+          (7/48)*F +
+          (1/48)*B +
+          (1/96)*(RT + LD + LT + RD) +
+          (1/192)*(BT + BR + BL + BD)
+
+      -- What should be computed for c2100 of t6.
+      expr2 = eval (Tetrahedron.fv t0) $
+              (3/8)*I +
+              (1/12)*(F + R + L + B) +
+              (1/64)*(FT + RT + LT + BT) +
+              (7/48)*T +
+              (1/48)*D +
+              (1/96)*(FR + FL + BR + BL) +
+              (1/192)*(FD + RD + LD + BD)
+
+
+-- | We know what (c t6 2 1 0 0) should be from Sorokina and Zeilfelder, p. 87.
+--   This test checks the actual value based on the FunctionValues of the cube.
+prop_c_tilde_2100_correct :: Cube -> Bool
+prop_c_tilde_2100_correct cube =
+    c t6 2 1 0 0 == (3/8)*int + (1/12)*(f + r + l + b) + (1/64)*(ft + rt + lt + bt)
+                              + (7/48)*t + (1/48)*d + (1/96)*(fr + fl + br + bl)
+                              + (1/192)*(fd + rd + ld + bd)
+    where
+      t0 = tetrahedron0 cube
+      t6 = tetrahedron6 cube
+      fvs = Tetrahedron.fv t0
+      int = interior fvs
+      f = front fvs
+      r = right fvs
+      l = left fvs
+      b = back fvs
+      ft = front_top fvs
+      rt = right_top fvs
+      lt = left_top fvs
+      bt = back_top fvs
+      t = top fvs
+      d = down fvs
+      fr = front_right fvs
+      fl = front_left fvs
+      br = back_right fvs
+      bl = back_left fvs
+      fd = front_down fvs
+      rd = right_down fvs
+      ld = left_down fvs
+      bd = back_down fvs
+
 -- Tests to check that the correct edges are incidental.
 prop_t0_shares_edge_with_t1 :: Cube -> Bool
 prop_t0_shares_edge_with_t1 cube =