From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 24 Aug 2011 14:12:52 +0000 (-0400)
Subject: Undo the previous FunctionValues test fix.
X-Git-Tag: 0.0.1~224
X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=043d7296b08add8050a54c463d06c78b06eb9838;p=spline3.git

Undo the previous FunctionValues test fix.
Update the Values.idx function to silently switch the 'x' and 'z' dimensions.
---

diff --git a/src/Tests/FunctionValues.hs b/src/Tests/FunctionValues.hs
index e14da7b..9cada35 100644
--- a/src/Tests/FunctionValues.hs
+++ b/src/Tests/FunctionValues.hs
@@ -11,7 +11,7 @@ test_directions :: Assertion
 test_directions =
     assertTrue "all direction functions work" (and equalities)
         where
-          fvs = make_values trilinear_repa 1 1 1
+          fvs = make_values trilinear 1 1 1
           equalities = [ interior fvs == 4,
                          front fvs == 1,
                          back  fvs == 7,
diff --git a/src/Values.hs b/src/Values.hs
index 1b8548e..61e3a11 100644
--- a/src/Values.hs
+++ b/src/Values.hs
@@ -79,7 +79,7 @@ idx v3d i j k =
     index v3d shape
     where
       shape :: DIM3
-      shape = (Z :. i :. j :. k)
+      shape = (Z :. k :. j :. i)
 
 
 zoom_shape :: Int -> DIM3 -> DIM3