X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FCube.hs;h=83f4da38f52638f300a655ce88dbfc3d46a9cd8a;hb=1b041ed87130177797758f471aa78fe55e65c9ae;hp=26b513d5983d0f5784375c29246a980db450b9fb;hpb=1fbb737e99c620f9ca3acd7d8a455ae57ca45130;p=spline3.git diff --git a/src/Cube.hs b/src/Cube.hs index 26b513d..83f4da3 100644 --- a/src/Cube.hs +++ b/src/Cube.hs @@ -28,15 +28,7 @@ import qualified Face (Face(Face, v0, v1, v2, v3)) import FunctionValues import Misc (all_equal, disjoint) import Point -import Tetrahedron ( - Tetrahedron(..), - c, - b0, - b1, - b2, - b3, - volume - ) +import Tetrahedron (Tetrahedron(..), c, volume) import ThreeDimensional data Cube = Cube { h :: Double, @@ -955,23 +947,6 @@ prop_c1011_identity cube = t6 = tetrahedron cube 6 - --- | Given in Sorokina and Zeilfelder, p. 78. -prop_cijk1_identity :: Cube -> Bool -prop_cijk1_identity cube = - and [ c t0 i j k 1 ~= - (c t1 (i+1) j k 0) * ((b0 t0) (v3 t1)) + - (c t1 i (j+1) k 0) * ((b1 t0) (v3 t1)) + - (c t1 i j (k+1) 0) * ((b2 t0) (v3 t1)) + - (c t1 i j k 1) * ((b3 t0) (v3 t1)) | i <- [0..2], - j <- [0..2], - k <- [0..2], - i + j + k == 2] - where - t0 = tetrahedron cube 0 - t1 = tetrahedron cube 1 - - -- | The function values at the interior should be the same for all -- tetrahedra. prop_interior_values_all_identical :: Cube -> Bool @@ -1139,14 +1114,6 @@ prop_t7_shares_edge_with_t20 cube = t20 = tetrahedron cube 20 - - - -p78_25_properties :: Test.Framework.Test -p78_25_properties = - testGroup "p. 78, Section (2.5) Properties" [ - testProperty "c_ijk1 identity" prop_cijk1_identity ] - p79_26_properties :: Test.Framework.Test p79_26_properties = testGroup "p. 79, Section (2.6) Properties" [ @@ -1207,7 +1174,6 @@ edge_incidence_tests = cube_properties :: Test.Framework.Test cube_properties = testGroup "Cube Properties" [ - p78_25_properties, p79_26_properties, p79_27_properties, p79_28_properties,