One-line cleanup.

[spline3.git] / src / Grid.hs

diff --git a/src/Grid.hs b/src/Grid.hs
index d31ffabdf2aa122cadacf0cc9d85513f4989033a..e4f3d62b9a661df068ec80e837fc9d7289734ea4 100644 (file)
--- a/src/Grid.hs
+++ b/src/Grid.hs
@@ -27,9 +27,8 @@ import Cube (Cube(Cube),
 import Examples
 import FunctionValues
 import Point (Point)
-import PolynomialArray (PolynomialArray)
 import ScaleFactor
-import Tetrahedron (Tetrahedron, c, number, polynomial, v0, v1, v2, v3)
+import Tetrahedron (Tetrahedron, c, polynomial, v0, v1, v2, v3)
 import ThreeDimensional
 import Values (Values3D, dims, empty3d, zoom_shape)
 
@@ -72,8 +71,9 @@ cubes delta fvs
                    j <- [0..ymax],
                    k <- [0..zmax],
                    let tet_vol = (1/24)*(delta^(3::Int)),
+                   let fvs' = make_values fvs i j k,
                    let cube_ijk =
-                         Cube delta i j k (make_values fvs i j k) tet_vol]
+                         Cube delta i j k fvs' tet_vol]
      where
        xmax = xsize - 1
        ymax = ysize - 1
@@ -133,15 +133,15 @@ find_containing_cube g p =
 
 
 {-# INLINE zoom_lookup #-}
-zoom_lookup :: Grid -> PolynomialArray -> ScaleFactor -> a -> (R.DIM3 -> Double)
-zoom_lookup g polynomials scale_factor _ =
-    zoom_result g polynomials scale_factor
+zoom_lookup :: Grid -> ScaleFactor -> a -> (R.DIM3 -> Double)
+zoom_lookup g scale_factor _ =
+    zoom_result g scale_factor
 
 
 {-# INLINE zoom_result #-}
-zoom_result :: Grid -> PolynomialArray -> ScaleFactor -> R.DIM3 -> Double
-zoom_result g polynomials (sfx, sfy, sfz) (R.Z R.:. m R.:. n R.:. o) =
-  (polynomials ! (i, j, k, (number t))) p
+zoom_result :: Grid -> ScaleFactor -> R.DIM3 -> Double
+zoom_result g (sfx, sfy, sfz) (R.Z R.:. m R.:. n R.:. o) =
+  f p
   where
     offset = (h g)/2
     m' = (fromIntegral m) / (fromIntegral sfx) - offset
@@ -149,16 +149,14 @@ zoom_result g polynomials (sfx, sfy, sfz) (R.Z R.:. m R.:. n R.:. o) =
     o' = (fromIntegral o) / (fromIntegral sfz) - offset
     p  = (m', n', o') :: Point
     cube = find_containing_cube g p
-    -- Figure out i,j,k without importing those functions.
-    Cube _ i j k _ _ = cube
     t = find_containing_tetrahedron cube p
-
+    f = polynomial t
     
-zoom :: Grid -> PolynomialArray -> ScaleFactor -> Values3D
-zoom g polynomials scale_factor
+zoom :: Grid -> ScaleFactor -> Values3D
+zoom g scale_factor
     | xsize == 0 || ysize == 0 || zsize == 0 = empty3d
     | otherwise =
-        R.force $ R.traverse arr transExtent (zoom_lookup g polynomials scale_factor)
+        R.force $ R.unsafeTraverse arr transExtent (zoom_lookup g scale_factor)
           where
             arr = function_values g
             (xsize, ysize, zsize) = dims arr
@@ -365,18 +363,18 @@ test_trilinear9x9x9_reproduced =
 --
 --   Example from before the fix:
 --
---   > b0 (tetrahedron c 15) p
---   -3.4694469519536365e-18
+--   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 t15 p
+             contains_point t20 p
   where
     g = make_grid 1 naturals_1d
-    cube = cube_at g 0 17 1
-    p = (0, 16.75, 0.5) :: Point
-    t15 = tetrahedron cube 15
+    cube = cube_at g 0 18 0
+    p = (0, 17.5, 0.5) :: Point
+    t20 = tetrahedron cube 20
 
 
 prop_cube_indices_never_go_out_of_bounds :: Grid -> Gen Bool