X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FGrid.hs;h=ca66437a6bb13b73d591b68d1b16d3ead8d60c89;hb=3f7331f579118687cd73b977ce6aa7d401f88a09;hp=647ec574f08b5338ce58042f9a54c9d3fcec3ff8;hpb=3f0b6b7faecc561af0b7312a11c73a44a1b416f6;p=spline3.git diff --git a/src/Grid.hs b/src/Grid.hs index 647ec57..ca66437 100644 --- a/src/Grid.hs +++ b/src/Grid.hs @@ -11,24 +11,28 @@ module Grid ( where import qualified Data.Array.Repa as R -import Test.HUnit +import Test.HUnit (Assertion, assertEqual) import Test.Framework (Test, testGroup) import Test.Framework.Providers.HUnit (testCase) import Test.Framework.Providers.QuickCheck2 (testProperty) -import Test.QuickCheck (Arbitrary(..), Gen, Positive(..), choose) - -import Assertions -import Comparisons +import Test.QuickCheck ((==>), + Arbitrary(..), + Gen, + Positive(..), + Property, + choose) +import Assertions (assertAlmostEqual, assertClose, assertTrue) +import Comparisons ((~=)) import Cube (Cube(Cube), find_containing_tetrahedron, tetrahedra, tetrahedron) -import Examples -import FunctionValues +import Examples (trilinear, trilinear9x9x9, zeros, naturals_1d) +import FunctionValues (make_values, value_at) import Point (Point) -import ScaleFactor +import ScaleFactor (ScaleFactor) import Tetrahedron (Tetrahedron, c, polynomial, v0, v1, v2, v3) -import ThreeDimensional +import ThreeDimensional (ThreeDimensional(..)) import Values (Values3D, dims, empty3d, zoom_shape) @@ -69,7 +73,7 @@ cube_at g i j k | k < 0 = error "k < 0 in cube_at" | k >= zsize = error "k >= zsize in cube_at" | otherwise = Cube delta i j k fvs' tet_vol - where + where fvs = function_values g (xsize, ysize, zsize) = dims fvs fvs' = make_values fvs i j k @@ -109,13 +113,11 @@ find_containing_cube g p = k = calculate_containing_cube_coordinate g z -{-# INLINE zoom_lookup #-} zoom_lookup :: Values3D -> ScaleFactor -> a -> (R.DIM3 -> Double) zoom_lookup v3d scale_factor _ = zoom_result v3d scale_factor -{-# INLINE zoom_result #-} zoom_result :: Values3D -> ScaleFactor -> R.DIM3 -> Double zoom_result v3d (sfx, sfy, sfz) (R.Z R.:. m R.:. n R.:. o) = f p @@ -135,11 +137,11 @@ zoom :: Values3D -> ScaleFactor -> Values3D zoom v3d scale_factor | xsize == 0 || ysize == 0 || zsize == 0 = empty3d | otherwise = - R.force $ R.unsafeTraverse v3d transExtent (zoom_lookup v3d scale_factor) + R.force $ R.unsafeTraverse v3d transExtent f where (xsize, ysize, zsize) = dims v3d transExtent = zoom_shape scale_factor - + f = zoom_lookup v3d scale_factor -- | Check all coefficients of tetrahedron0 belonging to the cube @@ -289,6 +291,7 @@ test_trilinear_reproduced = | i <- [0..2], j <- [0..2], k <- [0..2], + c0 <- cs, t <- tetrahedra c0, let p = polynomial t, let i' = fromIntegral i, @@ -296,7 +299,7 @@ test_trilinear_reproduced = let k' = fromIntegral k] where g = make_grid 1 trilinear - c0 = cube_at g 1 1 1 + cs = [ cube_at g ci cj ck | ci <- [0..2], cj <- [0..2], ck <- [0..2] ] test_zeros_reproduced :: Assertion @@ -308,12 +311,13 @@ test_zeros_reproduced = k <- [0..2], let i' = fromIntegral i, let j' = fromIntegral j, - let k' = fromIntegral k] + let k' = fromIntegral k, + c0 <- cs, + t0 <- tetrahedra c0, + let p = polynomial t0 ] where g = make_grid 1 zeros - c0 = cube_at g 1 1 1 - t0 = tetrahedron c0 0 - p = polynomial t0 + cs = [ cube_at g ci cj ck | ci <- [0..2], cj <- [0..2], ck <- [0..2] ] -- | Make sure we can reproduce a 9x9x9 trilinear from the 3x3x3 one. @@ -382,21 +386,127 @@ prop_cube_indices_never_go_out_of_bounds g = idx_z <= zsize - 1 +-- | Given in Sorokina and Zeilfelder, p. 80, (2.9). Note that the +-- third and fourth indices of c-t10 have been switched. This is +-- because we store the triangles oriented such that their volume is +-- positive. If T and T-tilde share \ and v0,v0-tilde point +-- in opposite directions, one of them has to have negative volume! +prop_c0120_identity :: Grid -> Property +prop_c0120_identity g = + and [xsize >= 3, ysize >= 3, zsize >= 3] ==> + c t0 0 1 2 0 ~= (c t0 1 0 2 0 + c t10 1 0 0 2) / 2 + where + fvs = function_values g + (xsize, ysize, zsize) = dims fvs + cube0 = cube_at g 1 1 1 + cube1 = cube_at g 0 1 1 + t0 = tetrahedron cube0 0 -- These two tetrahedra share a face. + t10 = tetrahedron cube1 10 + + +-- | Given in Sorokina and Zeilfelder, p. 80, (2.9). See +-- 'prop_c0120_identity'. +prop_c0111_identity :: Grid -> Property +prop_c0111_identity g = + and [xsize >= 3, ysize >= 3, zsize >= 3] ==> + c t0 0 1 1 1 ~= (c t0 1 0 1 1 + c t10 1 0 1 1) / 2 + where + fvs = function_values g + (xsize, ysize, zsize) = dims fvs + cube0 = cube_at g 1 1 1 + cube1 = cube_at g 0 1 1 + t0 = tetrahedron cube0 0 -- These two tetrahedra share a face. + t10 = tetrahedron cube1 10 + + +-- | Given in Sorokina and Zeilfelder, p. 80, (2.9). See +-- 'prop_c0120_identity'. +prop_c0201_identity :: Grid -> Property +prop_c0201_identity g = + and [xsize >= 3, ysize >= 3, zsize >= 3] ==> + c t0 0 2 0 1 ~= (c t0 1 1 0 1 + c t10 1 1 1 0) / 2 + where + fvs = function_values g + (xsize, ysize, zsize) = dims fvs + cube0 = cube_at g 1 1 1 + cube1 = cube_at g 0 1 1 + t0 = tetrahedron cube0 0 -- These two tetrahedra share a face. + t10 = tetrahedron cube1 10 + + +-- | Given in Sorokina and Zeilfelder, p. 80, (2.9). See +-- 'prop_c0120_identity'. +prop_c0102_identity :: Grid -> Property +prop_c0102_identity g = + and [xsize >= 3, ysize >= 3, zsize >= 3] ==> + c t0 0 1 0 2 ~= (c t0 1 0 0 2 + c t10 1 0 2 0) / 2 + where + fvs = function_values g + (xsize, ysize, zsize) = dims fvs + cube0 = cube_at g 1 1 1 + cube1 = cube_at g 0 1 1 + t0 = tetrahedron cube0 0 -- These two tetrahedra share a face. + t10 = tetrahedron cube1 10 + + +-- | Given in Sorokina and Zeilfelder, p. 80, (2.9). See +-- 'prop_c0120_identity'. +prop_c0210_identity :: Grid -> Property +prop_c0210_identity g = + and [xsize >= 3, ysize >= 3, zsize >= 3] ==> + c t0 0 2 1 0 ~= (c t0 1 1 1 0 + c t10 1 1 0 1) / 2 + where + fvs = function_values g + (xsize, ysize, zsize) = dims fvs + cube0 = cube_at g 1 1 1 + cube1 = cube_at g 0 1 1 + t0 = tetrahedron cube0 0 -- These two tetrahedra share a face. + t10 = tetrahedron cube1 10 + + +-- | Given in Sorokina and Zeilfelder, p. 80, (2.9). See +-- 'prop_c0120_identity'. +prop_c0300_identity :: Grid -> Property +prop_c0300_identity g = + and [xsize >= 3, ysize >= 3, zsize >= 3] ==> + c t0 0 3 0 0 ~= (c t0 1 2 0 0 + c t10 1 2 0 0) / 2 + where + fvs = function_values g + (xsize, ysize, zsize) = dims fvs + cube0 = cube_at g 1 1 1 + cube1 = cube_at g 0 1 1 + t0 = tetrahedron cube0 0 -- These two tetrahedra share a face. + t10 = tetrahedron cube1 10 + + +-- | All of the properties from Section (2.9), p. 80. These require a +-- grid since they refer to two adjacent cubes. +p80_29_properties :: Test.Framework.Test +p80_29_properties = + testGroup "p. 80, Section (2.9) Properties" [ + testProperty "c0120 identity" prop_c0120_identity, + testProperty "c0111 identity" prop_c0111_identity, + testProperty "c0201 identity" prop_c0201_identity, + testProperty "c0102 identity" prop_c0102_identity, + testProperty "c0210 identity" prop_c0210_identity, + testProperty "c0300 identity" prop_c0300_identity ] + grid_tests :: Test.Framework.Test grid_tests = testGroup "Grid Tests" [ trilinear_c0_t0_tests, + p80_29_properties, testCase "tetrahedra collision test isn't too sensitive" - test_tetrahedra_collision_sensitivity, - testCase "trilinear reproduced" test_trilinear_reproduced, - testCase "zeros reproduced" test_zeros_reproduced ] + test_tetrahedra_collision_sensitivity, + testProperty "cube indices within bounds" + prop_cube_indices_never_go_out_of_bounds ] -- Do the slow tests last so we can stop paying attention. slow_tests :: Test.Framework.Test slow_tests = testGroup "Slow Tests" [ - testProperty "cube indices within bounds" - prop_cube_indices_never_go_out_of_bounds, - testCase "trilinear9x9x9 reproduced" test_trilinear9x9x9_reproduced ] + testCase "trilinear reproduced" test_trilinear_reproduced, + testCase "trilinear9x9x9 reproduced" test_trilinear9x9x9_reproduced, + testCase "zeros reproduced" test_zeros_reproduced ]