Add bang patterns to the definition of Cube (Ben Lippmeier).

[spline3.git] / src / Cube.hs

diff --git a/src/Cube.hs b/src/Cube.hs
index 1144a13168d7041800d67e18876d2e4dd369cdc7..bec49b4086a09947697ec183ff97459e76f43122 100644 (file)
--- a/src/Cube.hs
+++ b/src/Cube.hs
@@ -25,18 +25,18 @@ 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)
 import ThreeDimensional
 
-data Cube = Cube { h :: Double,
-                   i :: Int,
-                   j :: Int,
-                   k :: Int,
-                   fv :: FunctionValues,
-                   tetrahedra_volume :: Double }
+data Cube = Cube { h  :: !Double,
+                   i  :: !Int,
+                   j  :: !Int,
+                   k  :: !Int,
+                   fv :: !FunctionValues,
+                   tetrahedra_volume :: !Double }
             deriving (Eq)
 
 
@@ -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
@@ -64,8 +68,7 @@ instance Show Cube where
         " ymin: " ++ (show (ymin cube)) ++ "\n" ++
         " ymax: " ++ (show (ymax cube)) ++ "\n" ++
         " zmin: " ++ (show (zmin cube)) ++ "\n" ++
-        " zmax: " ++ (show (zmax cube)) ++ "\n" ++
-        " fv: " ++ (show (Cube.fv cube)) ++ "\n"
+        " zmax: " ++ (show (zmax cube)) ++ "\n"
         where
           subscript =
               (show (i cube)) ++ "," ++ (show (j cube)) ++ "," ++ (show (k cube))