Import from FunctionValues explicitly.

[spline3.git] / src / Cube.hs

diff --git a/src/Cube.hs b/src/Cube.hs
index 6e67d4cd4d6d3c7311a7c095e4b43be9387ba69b..d0d4b7e59740fd80bf72ed2a05fa78091afdbc04 100644 (file)
--- a/src/Cube.hs
+++ b/src/Cube.hs
@@ -25,7 +25,7 @@ import Test.QuickCheck (Arbitrary(..), Gen, Positive(..), choose)
 import Cardinal
 import Comparisons ((~=), (~~=))
 import qualified Face (Face(Face, v0, v1, v2, v3))
-import FunctionValues
+import FunctionValues (FunctionValues, eval, rotate)
 import Misc (all_equal, disjoint)
 import Point
 import Tetrahedron (Tetrahedron(..), c, volume)
@@ -49,9 +49,13 @@ instance Arbitrary Cube where
       fv' <- arbitrary :: Gen FunctionValues
       (Positive tet_vol) <- arbitrary :: Gen (Positive Double)
       return (Cube h' i' j' k' fv' tet_vol)
-        where
-          coordmin = -268435456 -- -(2^29 / 2)
-          coordmax = 268435456  -- +(2^29 / 2)
+      where
+        -- The idea here is that, when cubed in the volume formula,
+        -- these numbers don't overflow 64 bits. This number is not
+        -- magic in any other sense than that it does not cause test
+        -- failures, while 2^23 does.
+        coordmax = 4194304 -- 2^22
+        coordmin = -coordmax
 
 
 instance Show Cube where