X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FGrid.hs;h=eb0de04a08110a973e3a89cbc03dfeb813110f65;hb=f1ea5f4014fdf8756fc6a70cf51052cdccbc4294;hp=94b9e1de7715bd4107a52904dff3ab803a0cd1a7;hpb=c02ac1bf9295e4ead58e9294af7f883a6fdcf119;p=spline3.git

diff --git a/src/Grid.hs b/src/Grid.hs
index 94b9e1d..eb0de04 100644
--- a/src/Grid.hs
+++ b/src/Grid.hs
@@ -28,14 +28,13 @@ import Cube (Cube(Cube),
              find_containing_tetrahedron,
              tetrahedra,
              tetrahedron)
-import Examples (trilinear, trilinear9x9x9, zeros, naturals_1d)
+import Examples (trilinear, trilinear9x9x9, zeros)
 import FunctionValues (make_values, value_at)
 import Point (Point(..))
 import ScaleFactor (ScaleFactor)
 import Tetrahedron (
   Tetrahedron(v0,v1,v2,v3),
   c,
-  contains_point,
   polynomial,
   )
 import Values (Values3D, dims, empty3d, zoom_shape)
@@ -336,25 +335,6 @@ test_trilinear9x9x9_reproduced =
       c0 = cube_at g 1 1 1
 
 
--- | 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:
---
---   b1 (tetrahedron c 20) (0, 17.5, 0.5)
---   -0.0
---
-test_tetrahedra_collision_sensitivity :: Assertion
-test_tetrahedra_collision_sensitivity =
-  assertTrue "tetrahedron collision tests isn't too sensitive" $
-             contains_point t20 p
-  where
-    g = make_grid 1 naturals_1d
-    cube = cube_at g 0 18 0
-    p = Point 0 17.5 0.5
-    t20 = tetrahedron cube 20
-
 
 prop_cube_indices_never_go_out_of_bounds :: Grid -> Gen Bool
 prop_cube_indices_never_go_out_of_bounds g =
@@ -495,8 +475,6 @@ grid_tests =
     testGroup "Grid Tests" [
       trilinear_c0_t0_tests,
       p80_29_properties,
-      testCase "tetrahedra collision test isn't too sensitive"
-        test_tetrahedra_collision_sensitivity,
       testProperty "cube indices within bounds"
         prop_cube_indices_never_go_out_of_bounds ]