From: Michael Orlitzky Date: Mon, 2 May 2011 20:37:41 +0000 (-0400) Subject: Add a bunch more coefficient tests. X-Git-Tag: 0.0.1~347 X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=896a6da8ee16070b6dc6e4d0ed59bf6904b06da4;p=spline3.git Add a bunch more coefficient tests. --- diff --git a/src/Tests/Face.hs b/src/Tests/Face.hs index fb02539..decb77a 100644 --- a/src/Tests/Face.hs +++ b/src/Tests/Face.hs @@ -16,6 +16,7 @@ import Face (face0, tetrahedron3, tetrahedrons) import Grid (Grid(h), make_grid) +import Point import Tetrahedron @@ -30,6 +31,15 @@ assertAlmostEqual preface expected actual = "expected: " ++ show expected ++ "\n but got: " ++ show actual +-- | An HUnit assertion that wraps the is_close function. Stolen +-- from the definition of assertEqual in Test/HUnit/Base.hs. +assertClose :: String -> Point -> Point -> Assertion +assertClose preface expected actual = + unless (actual `is_close` expected) (assertFailure msg) + where msg = (if null preface then "" else preface ++ "\n") ++ + "expected: " ++ show expected ++ "\n but got: " ++ show actual + + -- | Values of the function f(x,y,z) = 1 + x + xy + xyz taken at nine -- points (hi, hj, jk) with h = 1. From example one in the paper. -- Used in the next bunch of tests. @@ -176,6 +186,153 @@ test_trilinear_c1020 = t = head (tetrahedrons cube) -- Any one will do. +-- | Check the value of c1002 for any tetrahedron belonging to the +-- cube centered on (1,1,1) with a grid constructed from the +-- trilinear values. See example one in the paper. +test_trilinear_c1002 :: Test +test_trilinear_c1002 = + TestCase $ assertAlmostEqual "c1002 is correct" (c t 1 0 0 2) (23/6) + where + g = make_grid 1 trilinear + cube = cube_at g 1 1 1 + t = head (tetrahedrons cube) -- Any one will do. + + +-- | Check the value of c1011 for any tetrahedron belonging to the +-- cube centered on (1,1,1) with a grid constructed from the +-- trilinear values. See example one in the paper. +test_trilinear_c1011 :: Test +test_trilinear_c1011 = + TestCase $ assertAlmostEqual "c1011 is correct" (c t 1 0 1 1) (13/4) + where + g = make_grid 1 trilinear + cube = cube_at g 1 1 1 + t = head (tetrahedrons cube) -- Any one will do. + + +-- | Check the value of c1110 for any tetrahedron belonging to the +-- cube centered on (1,1,1) with a grid constructed from the +-- trilinear values. See example one in the paper. +test_trilinear_c1110 :: Test +test_trilinear_c1110 = + TestCase $ assertAlmostEqual "c1110 is correct" (c t 1 1 1 0) (23/8) + where + g = make_grid 1 trilinear + cube = cube_at g 1 1 1 + t = head (tetrahedrons cube) -- Any one will do. + + +-- | Check the value of c1101 for any tetrahedron belonging to the +-- cube centered on (1,1,1) with a grid constructed from the +-- trilinear values. See example one in the paper. +test_trilinear_c1101 :: Test +test_trilinear_c1101 = + TestCase $ assertAlmostEqual "c1101 is correct" (c t 1 1 0 1) (27/8) + where + g = make_grid 1 trilinear + cube = cube_at g 1 1 1 + t = head (tetrahedrons cube) -- Any one will do. + + +-- | Check the value of c1200 for any tetrahedron belonging to the +-- cube centered on (1,1,1) with a grid constructed from the +-- trilinear values. See example one in the paper. +test_trilinear_c1200 :: Test +test_trilinear_c1200 = + TestCase $ assertAlmostEqual "c1200 is correct" (c t 1 2 0 0) 3 + where + g = make_grid 1 trilinear + cube = cube_at g 1 1 1 + t = head (tetrahedrons cube) -- Any one will do. + + +-- | Check the value of c2010 for any tetrahedron belonging to the +-- cube centered on (1,1,1) with a grid constructed from the +-- trilinear values. See example one in the paper. +test_trilinear_c2010 :: Test +test_trilinear_c2010 = + TestCase $ assertAlmostEqual "c2010 is correct" (c t 2 0 1 0) (10/3) + where + g = make_grid 1 trilinear + cube = cube_at g 1 1 1 + t = head (tetrahedrons cube) -- Any one will do. + + +-- | Check the value of c2001 for any tetrahedron belonging to the +-- cube centered on (1,1,1) with a grid constructed from the +-- trilinear values. See example one in the paper. +test_trilinear_c2001 :: Test +test_trilinear_c2001 = + TestCase $ assertAlmostEqual "c2001 is correct" (c t 2 0 0 1) 4 + where + g = make_grid 1 trilinear + cube = cube_at g 1 1 1 + t = head (tetrahedrons cube) -- Any one will do. + + +-- | Check the value of c2100 for any tetrahedron belonging to the +-- cube centered on (1,1,1) with a grid constructed from the +-- trilinear values. See example one in the paper. +test_trilinear_c2100 :: Test +test_trilinear_c2100 = + TestCase $ assertAlmostEqual "c2100 is correct" (c t 2 1 0 0) (7/2) + where + g = make_grid 1 trilinear + cube = cube_at g 1 1 1 + t = head (tetrahedrons cube) -- Any one will do. + + +-- | Check the value of c3000 for any tetrahedron belonging to the +-- cube centered on (1,1,1) with a grid constructed from the +-- trilinear values. See example one in the paper. +test_trilinear_c3000 :: Test +test_trilinear_c3000 = + TestCase $ assertAlmostEqual "c3000 is correct" (c t 3 0 0 0) 4 + where + g = make_grid 1 trilinear + cube = cube_at g 1 1 1 + t = head (tetrahedrons cube) -- Any one will do. + + + +test_trilinear_f0_t0_v0 :: Test +test_trilinear_f0_t0_v0 = + TestCase $ assertClose "v0 is correct" (v0 t) (0.5, 1.5, 1.5) + where + g = make_grid 1 trilinear + cube = cube_at g 1 1 1 + t = tetrahedron0 (face0 cube) -- Any one will do. + + +test_trilinear_f0_t0_v1 :: Test +test_trilinear_f0_t0_v1 = + TestCase $ assertClose "v1 is correct" (v1 t) (1.5, 1.5, 1.5) + where + g = make_grid 1 trilinear + cube = cube_at g 1 1 1 + t = tetrahedron0 (face0 cube) -- Any one will do. + + +test_trilinear_f0_t0_v2 :: Test +test_trilinear_f0_t0_v2 = + TestCase $ assertClose "v2 is correct" (v2 t) (1, 1, 1.5) + where + g = make_grid 1 trilinear + cube = cube_at g 1 1 1 + t = tetrahedron0 (face0 cube) -- Any one will do. + + + +test_trilinear_f0_t0_v3 :: Test +test_trilinear_f0_t0_v3 = + TestCase $ assertClose "v3 is correct" (v3 t) (1, 1, 1) + where + g = make_grid 1 trilinear + cube = cube_at g 1 1 1 + t = tetrahedron0 (face0 cube) -- Any one will do. + + + face_tests :: [Test] face_tests = [test_trilinear_c0030, test_trilinear_c0003, @@ -187,7 +344,20 @@ face_tests = [test_trilinear_c0030, test_trilinear_c0210, test_trilinear_c0201, test_trilinear_c0300, - test_trilinear_c1020] + test_trilinear_c1020, + test_trilinear_c1002, + test_trilinear_c1011, + test_trilinear_c1110, + test_trilinear_c1101, + test_trilinear_c1200, + test_trilinear_c2010, + test_trilinear_c2001, + test_trilinear_c2100, + test_trilinear_c3000, + test_trilinear_f0_t0_v0, + test_trilinear_f0_t0_v1, + test_trilinear_f0_t0_v2, + test_trilinear_f0_t0_v3] -- QuickCheck Tests.