X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FCube.hs;h=2ec9e4848318fb12135309900e5505df20f3614e;hb=574a15e7ccfa3109f06fa05ed09e2282a03a7dad;hp=4c70a4126c7778e711806d200f3811d64c84c261;hpb=a73ad12eaff8510ae18ffafdefc0ae928603d5a5;p=spline3.git

diff --git a/src/Cube.hs b/src/Cube.hs
index 4c70a41..2ec9e48 100644
--- a/src/Cube.hs
+++ b/src/Cube.hs
@@ -33,6 +33,7 @@ instance Show Cube where
               (show (i c)) ++ "," ++ (show (j c)) ++ "," ++ (show (k c))
 
 
+-- | Returns an empty 'Cube'.
 empty_cube :: Cube
 empty_cube = Cube 0 0 0 0 empty_values
 
@@ -87,7 +88,7 @@ zmax c = (2*k' + 1)*delta / 2
 
 instance ThreeDimensional Cube where
     -- | The center of Cube_ijk coincides with v_ijk at
-    --   (ih, jh, kh). See Sorokina and Zeilfelder, p. 76.
+    --   (ih, jh, kh). See Sorokina and Zeilfelder, p. 76.    
     center c = (x, y, z)
            where
              delta = h c
@@ -98,6 +99,8 @@ instance ThreeDimensional Cube where
              y = delta * j'
              z = delta * k'
 
+    -- | It's easy to tell if a point is within a cube; just make sure
+    --   that it falls on the proper side of each of the cube's faces.
     contains_point c p
         | (x_coord p) < (xmin c) = False
         | (x_coord p) > (xmax c) = False
@@ -161,10 +164,10 @@ left_face :: Cube -> Face.Face
 left_face c = Face.Face v0' v1' v2' v3'
     where
       delta = (1/2)*(h c)
-      v0' = (center c) + (-delta, -delta, delta)
-      v1' = (center c) + (delta, -delta, delta)
-      v2' = (center c) + (delta, -delta, -delta)
-      v3' = (center c) + (-delta, -delta, -delta)
+      v0' = (center c) + (delta, -delta, delta)
+      v1' = (center c) + (-delta, -delta, delta)
+      v2' = (center c) + (-delta, -delta, -delta)
+      v3' = (center c) + (delta, -delta, -delta)
 
 
 -- | The right (in the direction of y) face of the cube.
@@ -172,10 +175,10 @@ right_face :: Cube -> Face.Face
 right_face c = Face.Face v0' v1' v2' v3'
     where
       delta = (1/2)*(h c)
-      v0' = (center c) + (-delta, delta, -delta)
-      v1' = (center c) + (delta, delta, -delta)
-      v2' = (center c) + (delta, delta, delta)
-      v3' = (center c) + (-delta, delta, delta)
+      v0' = (center c) + (-delta, delta, delta)
+      v1' = (center c) + (delta, delta, delta)
+      v2' = (center c) + (delta, delta, -delta)
+      v3' = (center c) + (-delta, delta, -delta)
 
 
 tetrahedron0 :: Cube -> Tetrahedron
@@ -195,7 +198,7 @@ tetrahedron1 c =
       v1' = center (front_face c)
       v2' = Face.v1 (front_face c)
       v3' = Face.v2 (front_face c)
-      fv' = rotate (Cube.fv c) ccwx
+      fv' = rotate ccwx (Cube.fv c)
 
 tetrahedron2 :: Cube -> Tetrahedron
 tetrahedron2 c =
@@ -205,7 +208,7 @@ tetrahedron2 c =
       v1' = center (front_face c)
       v2' = Face.v2 (front_face c)
       v3' = Face.v3 (front_face c)
-      fv' = rotate (Cube.fv c) (ccwx . ccwx)
+      fv' = rotate ccwx $ rotate ccwx $ Cube.fv c
 
 tetrahedron3 :: Cube -> Tetrahedron
 tetrahedron3 c =
@@ -215,7 +218,7 @@ tetrahedron3 c =
       v1' = center (front_face c)
       v2' = Face.v3 (front_face c)
       v3' = Face.v0 (front_face c)
-      fv' = rotate (Cube.fv c) cwx
+      fv' = rotate cwx (Cube.fv c)
 
 tetrahedron4 :: Cube -> Tetrahedron
 tetrahedron4 c =
@@ -225,7 +228,7 @@ tetrahedron4 c =
       v1' = center (top_face c)
       v2' = Face.v0 (top_face c)
       v3' = Face.v1 (top_face c)
-      fv' = rotate (Cube.fv c) cwy
+      fv' = rotate cwy (Cube.fv c)
 
 tetrahedron5 :: Cube -> Tetrahedron
 tetrahedron5 c =
@@ -235,7 +238,7 @@ tetrahedron5 c =
       v1' = center (top_face c)
       v2' = Face.v1 (top_face c)
       v3' = Face.v2 (top_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron4 c)) ccwz
+      fv' = rotate cwy $ rotate cwz $ Tetrahedron.fv (tetrahedron0 c)
 
 tetrahedron6 :: Cube -> Tetrahedron
 tetrahedron6 c =
@@ -245,7 +248,7 @@ tetrahedron6 c =
       v1' = center (top_face c)
       v2' = Face.v2 (top_face c)
       v3' = Face.v3 (top_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron4 c)) (ccwz . ccwz)
+      fv' = rotate cwy $ rotate cwz $ rotate cwz $ Tetrahedron.fv (tetrahedron0 c)
 
 tetrahedron7 :: Cube -> Tetrahedron
 tetrahedron7 c =
@@ -255,7 +258,7 @@ tetrahedron7 c =
       v1' = center (top_face c)
       v2' = Face.v3 (top_face c)
       v3' = Face.v0 (top_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron4 c)) cwz
+      fv' = rotate cwy $ rotate ccwz $ Tetrahedron.fv (tetrahedron0 c)
 
 tetrahedron8 :: Cube -> Tetrahedron
 tetrahedron8 c =
@@ -265,7 +268,7 @@ tetrahedron8 c =
       v1' = center (back_face c)
       v2' = Face.v0 (back_face c)
       v3' = Face.v1 (back_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron4 c)) cwy
+      fv' = rotate cwy $ rotate cwy $ (Tetrahedron.fv (tetrahedron0 c))
 
 tetrahedron9 :: Cube -> Tetrahedron
 tetrahedron9 c =
@@ -275,7 +278,7 @@ tetrahedron9 c =
       v1' = center (back_face c)
       v2' = Face.v1 (back_face c)
       v3' = Face.v2 (back_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron8 c)) ccwx
+      fv' = rotate cwy $ rotate cwy $ rotate cwx $ Tetrahedron.fv (tetrahedron0 c)
 
 tetrahedron10 :: Cube -> Tetrahedron
 tetrahedron10 c =
@@ -285,7 +288,10 @@ tetrahedron10 c =
       v1' = center (back_face c)
       v2' = Face.v2 (back_face c)
       v3' = Face.v3 (back_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron8 c)) (ccwx . ccwx)
+      fv' = rotate cwy $ rotate cwy
+                       $ rotate cwx
+                       $ rotate cwx
+                       $ Tetrahedron.fv (tetrahedron0 c)
 
 
 tetrahedron11 :: Cube -> Tetrahedron
@@ -296,7 +302,9 @@ tetrahedron11 c =
       v1' = center (back_face c)
       v2' = Face.v3 (back_face c)
       v3' = Face.v0 (back_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron8 c)) cwx
+      fv' = rotate cwy $ rotate cwy
+                       $ rotate ccwx
+                       $ Tetrahedron.fv (tetrahedron0 c)
 
 
 tetrahedron12 :: Cube -> Tetrahedron
@@ -307,7 +315,7 @@ tetrahedron12 c =
       v1' = center (down_face c)
       v2' = Face.v0 (down_face c)
       v3' = Face.v1 (down_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron8 c)) cwy
+      fv' = rotate ccwy (Tetrahedron.fv (tetrahedron0 c))
 
 
 tetrahedron13 :: Cube -> Tetrahedron
@@ -318,7 +326,7 @@ tetrahedron13 c =
       v1' = center (down_face c)
       v2' = Face.v1 (down_face c)
       v3' = Face.v2 (down_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron12 c)) ccwz
+      fv' = rotate ccwy $ rotate ccwz $ Tetrahedron.fv (tetrahedron0 c)
 
 
 tetrahedron14 :: Cube -> Tetrahedron
@@ -329,7 +337,9 @@ tetrahedron14 c =
       v1' = center (down_face c)
       v2' = Face.v2 (down_face c)
       v3' = Face.v3 (down_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron13 c)) (ccwz . ccwz)
+      fv' = rotate ccwy $ rotate ccwz
+                        $ rotate ccwz
+                        $ Tetrahedron.fv (tetrahedron0 c)
 
 
 tetrahedron15 :: Cube -> Tetrahedron
@@ -340,7 +350,101 @@ tetrahedron15 c =
       v1' = center (down_face c)
       v2' = Face.v3 (down_face c)
       v3' = Face.v0 (down_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron12 c)) cwz
+      fv' = rotate ccwy $ rotate cwz $ Tetrahedron.fv (tetrahedron0 c)
+
+
+tetrahedron16 :: Cube -> Tetrahedron
+tetrahedron16 c =
+    Tetrahedron fv' v0' v1' v2' v3'
+    where
+      v0' = center c
+      v1' = center (right_face c)
+      v2' = Face.v0 (right_face c)
+      v3' = Face.v1 (right_face c)
+      fv' = rotate ccwz (Tetrahedron.fv (tetrahedron0 c))
+
+
+tetrahedron17 :: Cube -> Tetrahedron
+tetrahedron17 c =
+    Tetrahedron fv' v0' v1' v2' v3'
+    where
+      v0' = center c
+      v1' = center (right_face c)
+      v2' = Face.v1 (right_face c)
+      v3' = Face.v2 (right_face c)
+      fv' = rotate ccwz $ rotate cwy $ Tetrahedron.fv (tetrahedron0 c)
+
+
+tetrahedron18 :: Cube -> Tetrahedron
+tetrahedron18 c =
+    Tetrahedron fv' v0' v1' v2' v3'
+    where
+      v0' = center c
+      v1' = center (right_face c)
+      v2' = Face.v2 (right_face c)
+      v3' = Face.v3 (right_face c)
+      fv' = rotate ccwz $ rotate cwy
+                        $ rotate cwy
+                        $ Tetrahedron.fv (tetrahedron0 c)
+
+
+tetrahedron19 :: Cube -> Tetrahedron
+tetrahedron19 c =
+    Tetrahedron fv' v0' v1' v2' v3'
+    where
+      v0' = center c
+      v1' = center (right_face c)
+      v2' = Face.v3 (right_face c)
+      v3' = Face.v0 (right_face c)
+      fv' = rotate ccwz $ rotate ccwy
+                        $ Tetrahedron.fv (tetrahedron0 c)
+
+
+tetrahedron20 :: Cube -> Tetrahedron
+tetrahedron20 c =
+    Tetrahedron fv' v0' v1' v2' v3'
+    where
+      v0' = center c
+      v1' = center (left_face c)
+      v2' = Face.v0 (left_face c)
+      v3' = Face.v1 (left_face c)
+      fv' = rotate cwz (Tetrahedron.fv (tetrahedron0 c))
+
+
+tetrahedron21 :: Cube -> Tetrahedron
+tetrahedron21 c =
+    Tetrahedron fv' v0' v1' v2' v3'
+    where
+      v0' = center c
+      v1' = center (left_face c)
+      v2' = Face.v1 (left_face c)
+      v3' = Face.v2 (left_face c)
+      fv' = rotate cwz $ rotate ccwy $ Tetrahedron.fv (tetrahedron0 c)
+
+
+tetrahedron22 :: Cube -> Tetrahedron
+tetrahedron22 c =
+    Tetrahedron fv' v0' v1' v2' v3'
+    where
+      v0' = center c
+      v1' = center (left_face c)
+      v2' = Face.v2 (left_face c)
+      v3' = Face.v3 (left_face c)
+      fv' = rotate cwz $ rotate ccwy
+                       $ rotate ccwy
+                       $ Tetrahedron.fv (tetrahedron0 c)
+
+
+tetrahedron23 :: Cube -> Tetrahedron
+tetrahedron23 c =
+    Tetrahedron fv' v0' v1' v2' v3'
+    where
+      v0' = center c
+      v1' = center (left_face c)
+      v2' = Face.v3 (left_face c)
+      v3' = Face.v0 (left_face c)
+      fv' = rotate cwz $ rotate cwy
+                       $ Tetrahedron.fv (tetrahedron0 c)
 
 
 tetrahedrons :: Cube -> [Tetrahedron]
@@ -360,15 +464,22 @@ tetrahedrons c =
      tetrahedron12 c,
      tetrahedron13 c,
      tetrahedron14 c,
-     tetrahedron15 c
-                --  tetrahedron16 c,
-                --  tetrahedron17 c,
-                --  tetrahedron18 c,
-                --  tetrahedron19 c,
-                --  tetrahedron20 c,
-                --  tetrahedron21 c,
-                --  tetrahedron21 c,
-                --  tetrahedron22 c,
-                --  tetrahedron23 c,
-                --  tetrahedron24 c
-    ]
+     tetrahedron15 c,
+     tetrahedron16 c,
+     tetrahedron17 c,
+     tetrahedron18 c,
+     tetrahedron19 c,
+     tetrahedron20 c,
+     tetrahedron21 c,
+     tetrahedron22 c,
+     tetrahedron23 c]
+
+
+-- | Takes a 'Cube', and returns all Tetrahedra belonging to it that
+--   contain the given 'Point'.
+find_containing_tetrahedra :: Cube -> Point -> [Tetrahedron]
+find_containing_tetrahedra c p =
+    filter contains_our_point all_tetrahedra
+    where
+      contains_our_point = flip contains_point p
+      all_tetrahedra = tetrahedrons c