X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTetrahedron.hs;h=5b459fea2870de5c2fed88ee9f9e5b57c7e5cfc9;hb=5a21d504c18c0fa28d17286c0c5c9e7929d7f59e;hp=1f7c22b355c0392f26988a1d9c315e63fee2d68e;hpb=b2e1c440b9b1bb99ae564d6600230bbd1f7d204c;p=spline3.git

diff --git a/src/Tetrahedron.hs b/src/Tetrahedron.hs
index 1f7c22b..5b459fe 100644
--- a/src/Tetrahedron.hs
+++ b/src/Tetrahedron.hs
@@ -3,7 +3,7 @@ where
 
 import Numeric.LinearAlgebra hiding (i, scale)
 import Prelude hiding (LT)
-import Test.QuickCheck (Arbitrary(..), Gen)
+import Test.QuickCheck (Arbitrary(..), Gen, choose)
 
 import Cardinal
 import Comparisons (nearly_ge)
@@ -13,13 +13,20 @@ import Point
 import RealFunction
 import ThreeDimensional
 
-data Tetrahedron = Tetrahedron { fv :: FunctionValues,
-                                 v0 :: Point,
-                                 v1 :: Point,
-                                 v2 :: Point,
-                                 v3 :: Point,
-                                 precomputed_volume :: Double }
-                   deriving (Eq)
+data Tetrahedron =
+  Tetrahedron { fv :: FunctionValues,
+                v0 :: Point,
+                v1 :: Point,
+                v2 :: Point,
+                v3 :: Point,
+                precomputed_volume :: Double,
+
+                -- | Between 0 and 23; used to quickly determine which
+                --   tetrahedron I am in the parent 'Cube' without
+                --   having to compare them all.
+                number :: Int
+              }
+    deriving (Eq)
 
 
 instance Arbitrary Tetrahedron where
@@ -29,15 +36,18 @@ instance Arbitrary Tetrahedron where
       rnd_v2 <- arbitrary :: Gen Point
       rnd_v3 <- arbitrary :: Gen Point
       rnd_fv <- arbitrary :: Gen FunctionValues
+      rnd_no <- choose (0,23)
+
       -- We can't assign an incorrect precomputed volume,
       -- so we have to calculate the correct one here.
-      let t' = Tetrahedron rnd_fv rnd_v0 rnd_v1 rnd_v2 rnd_v3 0
+      let t' = Tetrahedron rnd_fv rnd_v0 rnd_v1 rnd_v2 rnd_v3 0 rnd_no
       let vol = volume t'
-      return (Tetrahedron rnd_fv rnd_v0 rnd_v1 rnd_v2 rnd_v3 vol)
+      return (Tetrahedron rnd_fv rnd_v0 rnd_v1 rnd_v2 rnd_v3 vol rnd_no)
 
 
 instance Show Tetrahedron where
     show t = "Tetrahedron:\n" ++
+             "  no: " ++ (show (number t)) ++ "\n" ++
              "  fv: " ++ (show (fv t)) ++ "\n" ++
              "  v0: " ++ (show (v0 t)) ++ "\n" ++
              "  v1: " ++ (show (v1 t)) ++ "\n" ++
@@ -46,7 +56,9 @@ instance Show Tetrahedron where
 
 
 instance ThreeDimensional Tetrahedron where
-    center t = ((v0 t) + (v1 t) + (v2 t) + (v3 t)) `scale` (1/4)
+    center (Tetrahedron _ v0' v1' v2' v3' _ _) =
+        (v0' + v1' + v2' + v3') `scale` (1/4)
+
     contains_point t p =
       b0_unscaled `nearly_ge` 0 &&
       b1_unscaled `nearly_ge` 0 &&