X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FFunctionValues.hs;h=681a23b9fa517a935faf3d553d1202deaacb6bae;hb=627cae8a6bd5da6cd1a4b51b3eb5bb0f60ecbce2;hp=ed83f73336eac561b7d2450061ecd2bcf5709051;hpb=d60de7d5ab06d6c3261826b843ee89cf12ab9667;p=spline3.git

diff --git a/src/FunctionValues.hs b/src/FunctionValues.hs
index ed83f73..681a23b 100644
--- a/src/FunctionValues.hs
+++ b/src/FunctionValues.hs
@@ -20,24 +20,24 @@ data FunctionValues =
                      down   :: Double,
                      front_left :: Double,
                      front_right :: Double,
-                     front_top :: Double,
                      front_down :: Double,
+                     front_top :: Double,
                      back_left :: Double,
                      back_right :: Double,
-                     back_top :: Double,
                      back_down :: Double,
-                     left_top :: Double,
+                     back_top :: Double,
                      left_down :: Double,
-                     right_top :: Double,
+                     left_top :: Double,
                      right_down :: Double,
-                     front_left_top :: Double,
+                     right_top :: Double,
                      front_left_down :: Double,
-                     front_right_top :: Double,
+                     front_left_top :: Double,
                      front_right_down :: Double,
-                     back_left_top :: Double,
+                     front_right_top :: Double,
                      back_left_down :: Double,
-                     back_right_top :: Double,
+                     back_left_top :: Double,
                      back_right_down :: Double,
+                     back_right_top :: Double,
                      interior :: Double }
       deriving (Eq, Show)
 
@@ -121,13 +121,13 @@ make_values values i j k =
                    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_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_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),
@@ -137,8 +137,8 @@ make_values values i j k =
 --   'Cardinal' to another (called a rotation). Then it applies the
 --   rotation to each element of the 'FunctionValues' object, and
 --   returns the result.
-rotate :: FunctionValues -> (Cardinal -> Cardinal) -> FunctionValues
-rotate fv rotation =
+rotate :: (Cardinal -> Cardinal) -> FunctionValues -> FunctionValues
+rotate rotation fv =
     FunctionValues { front  = eval fv (rotation F),
                      back   = eval fv (rotation B),
                      left   = eval fv (rotation L),