From: Michael Orlitzky Date: Sun, 10 Jul 2011 17:22:09 +0000 (-0400) Subject: Add 23 more tests for trilinear reproduction, testing the remaining tetrahedra. X-Git-Tag: 0.0.1~254 X-Git-Url: http://gitweb.michael.orlitzky.com/?p=spline3.git;a=commitdiff_plain;h=4d50411b7c5932c1e1487810aca9460059160042 Add 23 more tests for trilinear reproduction, testing the remaining tetrahedra. --- diff --git a/src/Tests/Grid.hs b/src/Tests/Grid.hs index b50d0c1..31dfdff 100644 --- a/src/Tests/Grid.hs +++ b/src/Tests/Grid.hs @@ -2,6 +2,7 @@ module Tests.Grid where import Data.Maybe (fromJust) +import Debug.Trace (trace) import Test.HUnit import Test.QuickCheck @@ -309,8 +310,8 @@ test_trilinear_f0_t0_v3 = t = tetrahedron0 cube -test_trilinear_reproduced :: Assertion -test_trilinear_reproduced = +test_trilinear_reproduced_t0 :: Assertion +test_trilinear_reproduced_t0 = assertTrue "trilinears are reproduced correctly" $ and [p (i', j', k') ~= value_at trilinear i j k | i <- [0..2], @@ -325,6 +326,377 @@ test_trilinear_reproduced = 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 test_zeros_reproduced = diff --git a/test/TestSuite.hs b/test/TestSuite.hs index 756bcf3..f4018af 100644 --- a/test/TestSuite.hs +++ b/test/TestSuite.hs @@ -61,7 +61,30 @@ grid_tests = tc "trilinear f0_t0_v1" test_trilinear_f0_t0_v1, tc "trilinear f0_t0_v2" test_trilinear_f0_t0_v2, tc "trilinear f0_t0_v3" test_trilinear_f0_t0_v3, - tc "trilinear reproduced" test_trilinear_reproduced, + tc "trilinear reproduced (t0)" test_trilinear_reproduced_t0, + tc "trilinear reproduced (t1)" test_trilinear_reproduced_t1, + tc "trilinear reproduced (t2)" test_trilinear_reproduced_t2, + tc "trilinear reproduced (t3)" test_trilinear_reproduced_t3, + tc "trilinear reproduced (t4)" test_trilinear_reproduced_t4, + tc "trilinear reproduced (t5)" test_trilinear_reproduced_t5, + tc "trilinear reproduced (t6)" test_trilinear_reproduced_t6, + tc "trilinear reproduced (t7)" test_trilinear_reproduced_t7, + tc "trilinear reproduced (t8)" test_trilinear_reproduced_t8, + tc "trilinear reproduced (t9)" test_trilinear_reproduced_t9, + tc "trilinear reproduced (t10)" test_trilinear_reproduced_t10, + tc "trilinear reproduced (t11)" test_trilinear_reproduced_t11, + tc "trilinear reproduced (t12)" test_trilinear_reproduced_t12, + tc "trilinear reproduced (t13)" test_trilinear_reproduced_t13, + tc "trilinear reproduced (t14)" test_trilinear_reproduced_t14, + tc "trilinear reproduced (t15)" test_trilinear_reproduced_t15, + tc "trilinear reproduced (t16)" test_trilinear_reproduced_t16, + tc "trilinear reproduced (t17)" test_trilinear_reproduced_t17, + tc "trilinear reproduced (t18)" test_trilinear_reproduced_t18, + tc "trilinear reproduced (t19)" test_trilinear_reproduced_t19, + tc "trilinear reproduced (t20)" test_trilinear_reproduced_t20, + tc "trilinear reproduced (t21)" test_trilinear_reproduced_t21, + tc "trilinear reproduced (t22)" test_trilinear_reproduced_t22, + tc "trilinear reproduced (t23)" test_trilinear_reproduced_t23, tc "zeros reproduced" test_zeros_reproduced ]