X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTests%2FGrid.hs;h=92ba20efbce2aa1c9f7bb843ec06806cb3e5d631;hb=ac0e94e82605a5fd1e3ee724cd597f48614689e4;hp=55ca31e4a1455137f42835fdbbaf16e532f686ea;hpb=a5e03816d88ef23d30bd81bb9fe2bfefcbfbcec1;p=spline3.git diff --git a/src/Tests/Grid.hs b/src/Tests/Grid.hs index 55ca31e..92ba20e 100644 --- a/src/Tests/Grid.hs +++ b/src/Tests/Grid.hs @@ -10,7 +10,9 @@ import Cube hiding (i, j, k) import Examples import FunctionValues (value_at) import Grid +import Point (Point) import Tetrahedron +import ThreeDimensional -- | Check the value of c0030 for tetrahedron0 belonging to the @@ -301,392 +303,21 @@ test_trilinear_f0_t0_v3 = t = tetrahedron0 cube -test_trilinear_reproduced_t0 :: Assertion -test_trilinear_reproduced_t0 = +test_trilinear_reproduced :: Assertion +test_trilinear_reproduced = assertTrue "trilinears are reproduced correctly" $ and [p (i', j', k') ~= value_at trilinear i j k | i <- [0..2], j <- [0..2], k <- [0..2], + t <- tetrahedra c0, + let p = polynomial t, let i' = fromIntegral i, let j' = fromIntegral j, let k' = fromIntegral k] where g = make_grid 1 trilinear c0 = fromJust $ cube_at g 1 1 1 - t0 = tetrahedron0 c0 - p = polynomial t0 - -test_trilinear_reproduced_t1 :: Assertion -test_trilinear_reproduced_t1 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t1 = tetrahedron1 c0 - p = polynomial t1 - -test_trilinear_reproduced_t2 :: Assertion -test_trilinear_reproduced_t2 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t2 = tetrahedron2 c0 - p = polynomial t2 - -test_trilinear_reproduced_t3 :: Assertion -test_trilinear_reproduced_t3 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t3 = tetrahedron3 c0 - p = polynomial t3 - -test_trilinear_reproduced_t4 :: Assertion -test_trilinear_reproduced_t4 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t4 = tetrahedron4 c0 - p = polynomial t4 - -test_trilinear_reproduced_t5 :: Assertion -test_trilinear_reproduced_t5 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t5 = tetrahedron5 c0 - p = polynomial t5 - -test_trilinear_reproduced_t6 :: Assertion -test_trilinear_reproduced_t6 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t6 = tetrahedron6 c0 - p = polynomial t6 - -test_trilinear_reproduced_t7 :: Assertion -test_trilinear_reproduced_t7 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t7 = tetrahedron7 c0 - p = polynomial t7 - -test_trilinear_reproduced_t8 :: Assertion -test_trilinear_reproduced_t8 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t8 = tetrahedron8 c0 - p = polynomial t8 - -test_trilinear_reproduced_t9 :: Assertion -test_trilinear_reproduced_t9 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t9 = tetrahedron9 c0 - p = polynomial t9 - -test_trilinear_reproduced_t10 :: Assertion -test_trilinear_reproduced_t10 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t10 = tetrahedron10 c0 - p = polynomial t10 - -test_trilinear_reproduced_t11 :: Assertion -test_trilinear_reproduced_t11 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t11 = tetrahedron11 c0 - p = polynomial t11 - -test_trilinear_reproduced_t12 :: Assertion -test_trilinear_reproduced_t12 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t12 = tetrahedron12 c0 - p = polynomial t12 - -test_trilinear_reproduced_t13 :: Assertion -test_trilinear_reproduced_t13 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t13 = tetrahedron13 c0 - p = polynomial t13 - - -test_trilinear_reproduced_t14 :: Assertion -test_trilinear_reproduced_t14 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t14 = tetrahedron14 c0 - p = polynomial t14 - -test_trilinear_reproduced_t15 :: Assertion -test_trilinear_reproduced_t15 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t15 = tetrahedron15 c0 - p = polynomial t15 - -test_trilinear_reproduced_t16 :: Assertion -test_trilinear_reproduced_t16 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t16 = tetrahedron16 c0 - p = polynomial t16 - -test_trilinear_reproduced_t17 :: Assertion -test_trilinear_reproduced_t17 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t17 = tetrahedron17 c0 - p = polynomial t17 - -test_trilinear_reproduced_t18 :: Assertion -test_trilinear_reproduced_t18 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t18 = tetrahedron18 c0 - p = polynomial t18 - -test_trilinear_reproduced_t19 :: Assertion -test_trilinear_reproduced_t19 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t19 = tetrahedron19 c0 - p = polynomial t19 - -test_trilinear_reproduced_t20 :: Assertion -test_trilinear_reproduced_t20 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t20 = tetrahedron20 c0 - p = polynomial t20 - - -test_trilinear_reproduced_t21 :: Assertion -test_trilinear_reproduced_t21 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t21 = tetrahedron21 c0 - p = polynomial t21 - -test_trilinear_reproduced_t22 :: Assertion -test_trilinear_reproduced_t22 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t22 = tetrahedron22 c0 - p = polynomial t22 - - -test_trilinear_reproduced_t23 :: Assertion -test_trilinear_reproduced_t23 = - assertTrue "trilinears are reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinear i j k - | i <- [0..2], - j <- [0..2], - k <- [0..2], - let i' = fromIntegral i, - let j' = fromIntegral j, - let k' = fromIntegral k] - where - g = make_grid 1 trilinear - c0 = fromJust $ cube_at g 1 1 1 - t19 = tetrahedron19 c0 - p = polynomial t19 test_zeros_reproduced :: Assertion @@ -707,18 +338,42 @@ test_zeros_reproduced = -- | Make sure we can reproduce a 9x9x9 trilinear from the 3x3x3 one. -test_trilinearx2_reproduced_t0 :: Assertion -test_trilinearx2_reproduced_t0 = - assertTrue "trilinearx2 is reproduced correctly" $ - and [p (i', j', k') ~= value_at trilinearx2 i j k +test_trilinear9x9x9_reproduced :: Assertion +test_trilinear9x9x9_reproduced = + assertTrue "trilinear 9x9x9 is reproduced correctly" $ + and [p (i', j', k') ~= value_at trilinear9x9x9 i j k | i <- [0..8], j <- [0..8], k <- [0..8], + t <- tetrahedra c0, + let p = polynomial t, let i' = (fromIntegral i) * 0.5, let j' = (fromIntegral j) * 0.5, let k' = (fromIntegral k) * 0.5] where g = make_grid 1 trilinear c0 = fromJust $ cube_at g 1 1 1 - t0 = tetrahedron0 c0 - p = polynomial t0 + + +-- | The point 'p' in this test lies on the boundary of tetrahedra 12 and 15. +-- However, the 'contains_point' test fails due to some numerical innacuracy. +-- This bug should have been fixed by setting a positive tolerance level. +-- +-- Example from before the fix: +-- +-- > b0 (tetrahedron12 c) p +-- -2.168404344971019e-18 +-- > b0 (tetrahedron15 c) p +-- -3.4694469519536365e-18 +-- +test_tetrahedra_collision_sensitivity :: Assertion +test_tetrahedra_collision_sensitivity = + assertTrue "tetrahedron collision tests aren't too sensitive" $ + contains_point t12 p && + contains_point t15 p + where + g = make_grid 1 trilinear + c = cube_at g 0 17 1 + p = (0, 16.75, 0.5) :: Point + t12 = tetrahedron12 c + t15 = tetrahedron15 c