X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FFunctionValues.hs;fp=src%2FFunctionValues.hs;h=bc1414630a6ca44b64e7667cf08423e388634a99;hb=0696fc4f3e428d2156f0be4ca40728abf2e35abe;hp=62b861cea848a7947790b2346de514f12cd07b8d;hpb=d47fe5a8e167d8bdc0b4edf2899eee351615ccf8;p=spline3.git diff --git a/src/FunctionValues.hs b/src/FunctionValues.hs index 62b861c..bc14146 100644 --- a/src/FunctionValues.hs +++ b/src/FunctionValues.hs @@ -290,32 +290,32 @@ value_at v3d !i !j !k -- object centered at (i,j,k) make_values :: Values3D -> Int -> Int -> Int -> FunctionValues make_values values !i !j !k = - empty_values { front = value_at values (i-1) j k, - back = value_at values (i+1) j k, - left = value_at values i (j-1) k, - right = value_at values i (j+1) k, - down = value_at values i j (k-1), - top = value_at values i j (k+1), - front_left = value_at values (i-1) (j-1) k, - front_right = value_at values (i-1) (j+1) k, - front_down =value_at values (i-1) j (k-1), - front_top = value_at values (i-1) j (k+1), - back_left = value_at values (i+1) (j-1) k, - back_right = value_at values (i+1) (j+1) k, - back_down = value_at values (i+1) j (k-1), - back_top = value_at values (i+1) j (k+1), - left_down = value_at values i (j-1) (k-1), - left_top = value_at values i (j-1) (k+1), - right_down = value_at values i (j+1) (k-1), - right_top = value_at values i (j+1) (k+1), - front_left_down = value_at values (i-1) (j-1) (k-1), - front_left_top = value_at values (i-1) (j-1) (k+1), - front_right_down = value_at values (i-1) (j+1) (k-1), - front_right_top = value_at values (i-1) (j+1) (k+1), - back_left_down = value_at values (i+1) (j-1) (k-1), - back_left_top = value_at values (i+1) (j-1) (k+1), - back_right_down = value_at values (i+1) (j+1) (k-1), - back_right_top = value_at values (i+1) (j+1) (k+1), + empty_values { front = value_at values (i - 1) j k, + back = value_at values (i + 1) j k, + left = value_at values i (j - 1) k, + right = value_at values i (j + 1) k, + down = value_at values i j (k - 1), + top = value_at values i j (k + 1), + front_left = value_at values (i - 1) (j - 1) k, + front_right = value_at values (i - 1) (j + 1) k, + front_down =value_at values (i - 1) j (k - 1), + front_top = value_at values (i - 1) j (k + 1), + back_left = value_at values (i + 1) (j - 1) k, + back_right = value_at values (i + 1) (j + 1) k, + back_down = value_at values (i + 1) j (k - 1), + back_top = value_at values (i + 1) j (k + 1), + left_down = value_at values i (j - 1) (k - 1), + left_top = value_at values i (j - 1) (k + 1), + right_down = value_at values i (j + 1) (k - 1), + right_top = value_at values i (j + 1) (k + 1), + front_left_down = value_at values (i - 1) (j - 1) (k - 1), + front_left_top = value_at values (i - 1) (j - 1) (k + 1), + front_right_down = value_at values (i - 1) (j + 1) (k - 1), + front_right_top = value_at values (i - 1) (j + 1) (k + 1), + back_left_down = value_at values (i + 1) (j - 1) (k - 1), + back_left_top = value_at values (i + 1) (j - 1) (k + 1), + back_right_down = value_at values (i + 1) (j + 1) (k - 1), + back_right_top = value_at values (i + 1) (j + 1) (k + 1), interior = value_at values i j k } -- | Takes a 'FunctionValues' and a function that transforms one