Rename Tetrahedron.fv to Tetrahedron.function_values.

[spline3.git] / src / Tetrahedron.hs

diff --git a/src/Tetrahedron.hs b/src/Tetrahedron.hs
index 6da41945dd6ad01b521acb2d0349c01390c7bd54..b8d4fe67943ef30db4b14f00f87c7bc5bee96b2c 100644 (file)
--- a/src/Tetrahedron.hs
+++ b/src/Tetrahedron.hs
@@ -34,7 +34,7 @@ import RealFunction
 import ThreeDimensional
 
 data Tetrahedron =
-  Tetrahedron { fv :: FunctionValues,
+  Tetrahedron { function_values :: FunctionValues,
                 v0 :: Point,
                 v1 :: Point,
                 v2 :: Point,
@@ -61,7 +61,7 @@ instance Arbitrary Tetrahedron where
 
 instance Show Tetrahedron where
     show t = "Tetrahedron:\n" ++
-             "  fv: " ++ (show (fv t)) ++ "\n" ++
+             "  function_values: " ++ (show (function_values t)) ++ "\n" ++
              "  v0: " ++ (show (v0 t)) ++ "\n" ++
              "  v1: " ++ (show (v1 t)) ++ "\n" ++
              "  v2: " ++ (show (v2 t)) ++ "\n" ++
@@ -161,73 +161,73 @@ beta t i j k l
 --   Zeilfelder, pp. 84-86. If incorrect indices are supplied, the
 --   function will simply error.
 c :: Tetrahedron -> Int -> Int -> Int -> Int -> Double
-c t 0 0 3 0 = eval (fv t) $
+c t 0 0 3 0 = eval (function_values t) $
               (1/8) * (I + F + L + T + LT + FL + FT + FLT)
 
-c t 0 0 0 3 = eval (fv t) $
+c t 0 0 0 3 = eval (function_values t) $
               (1/8) * (I + F + R + T + RT + FR + FT + FRT)
 
-c t 0 0 2 1 = eval (fv t) $
+c t 0 0 2 1 = eval (function_values t) $
               (5/24)*(I + F + T + FT) +
               (1/24)*(L + FL + LT + FLT)
 
-c t 0 0 1 2 = eval (fv t) $
+c t 0 0 1 2 = eval (function_values t) $
               (5/24)*(I + F + T + FT) +
               (1/24)*(R + FR + RT + FRT)
 
-c t 0 1 2 0 = eval (fv t) $
+c t 0 1 2 0 = eval (function_values t) $
               (5/24)*(I + F) +
               (1/8)*(L + T + FL + FT) +
               (1/24)*(LT + FLT)
 
-c t 0 1 0 2 = eval (fv t) $
+c t 0 1 0 2 = eval (function_values t) $
               (5/24)*(I + F) +
               (1/8)*(R + T + FR + FT) +
               (1/24)*(RT + FRT)
 
-c t 0 1 1 1 = eval (fv t) $
+c t 0 1 1 1 = eval (function_values t) $
           (13/48)*(I + F) +
           (7/48)*(T + FT) +
           (1/32)*(L + R + FL + FR) +
           (1/96)*(LT + RT + FLT + FRT)
 
-c t 0 2 1 0 = eval (fv t) $
+c t 0 2 1 0 = eval (function_values t) $
           (13/48)*(I + F) +
           (17/192)*(L + T + FL + FT) +
           (1/96)*(LT + FLT) +
           (1/64)*(R + D + FR + FD) +
           (1/192)*(RT + LD + FRT + FLD)
 
-c t 0 2 0 1 = eval (fv t) $
+c t 0 2 0 1 = eval (function_values t) $
           (13/48)*(I + F) +
           (17/192)*(R + T + FR + FT) +
           (1/96)*(RT + FRT) +
           (1/64)*(L + D + FL + FD) +
           (1/192)*(RD + LT + FLT + FRD)
 
-c t 0 3 0 0 = eval (fv t) $
+c t 0 3 0 0 = eval (function_values t) $
           (13/48)*(I + F) +
           (5/96)*(L + R + T + D + FL + FR + FT + FD) +
           (1/192)*(RT + RD + LT + LD + FRT + FRD + FLT + FLD)
 
-c t 1 0 2 0 = eval (fv t) $
+c t 1 0 2 0 = eval (function_values t) $
               (1/4)*I +
               (1/6)*(F + L + T) +
               (1/12)*(LT + FL + FT)
 
-c t 1 0 0 2 = eval (fv t) $
+c t 1 0 0 2 = eval (function_values t) $
               (1/4)*I +
               (1/6)*(F + R + T) +
               (1/12)*(RT + FR + FT)
 
-c t 1 0 1 1 = eval (fv t) $
+c t 1 0 1 1 = eval (function_values t) $
           (1/3)*I +
           (5/24)*(F + T) +
           (1/12)*FT +
           (1/24)*(L + R) +
           (1/48)*(LT + RT + FL + FR)
 
-c t 1 1 1 0 = eval (fv t) $
+c t 1 1 1 0 = eval (function_values t) $
           (1/3)*I +
           (5/24)*F +
           (1/8)*(L + T) +
@@ -235,7 +235,7 @@ c t 1 1 1 0 = eval (fv t) $
           (1/48)*(D + R + LT) +
           (1/96)*(FD + LD + RT + FR)
 
-c t 1 1 0 1 = eval (fv t) $
+c t 1 1 0 1 = eval (function_values t) $
           (1/3)*I +
           (5/24)*F +
           (1/8)*(R + T) +
@@ -243,26 +243,26 @@ c t 1 1 0 1 = eval (fv t) $
           (1/48)*(D + L + RT) +
           (1/96)*(FD + LT + RD + FL)
 
-c t 1 2 0 0 = eval (fv t) $
+c t 1 2 0 0 = eval (function_values t) $
           (1/3)*I +
           (5/24)*F +
           (7/96)*(L + R + T + D) +
           (1/32)*(FL + FR + FT + FD) +
           (1/96)*(RT + RD + LT + LD)
 
-c t 2 0 1 0 = eval (fv t) $
+c t 2 0 1 0 = eval (function_values t) $
           (3/8)*I +
           (7/48)*(F + T + L) +
           (1/48)*(R + D + B + LT + FL + FT) +
           (1/96)*(RT + BT + FR + FD + LD + BL)
 
-c t 2 0 0 1 = eval (fv t) $
+c t 2 0 0 1 = eval (function_values t) $
           (3/8)*I +
           (7/48)*(F + T + R) +
           (1/48)*(L + D + B + RT + FR + FT) +
           (1/96)*(LT + BT + FL + FD + RD + BR)
 
-c t 2 1 0 0 = eval (fv t) $
+c t 2 1 0 0 = eval (function_values t) $
           (3/8)*I +
           (1/12)*(T + R + L + D) +
           (1/64)*(FT + FR + FL + FD) +
@@ -271,7 +271,7 @@ c t 2 1 0 0 = eval (fv t) $
           (1/96)*(RT + LD + LT + RD) +
           (1/192)*(BT + BR + BL + BD)
 
-c t 3 0 0 0 = eval (fv t) $
+c t 3 0 0 0 = eval (function_values t) $
           (3/8)*I +
           (1/12)*(T + F + L + R + D + B) +
           (1/96)*(LT + FL + FT + RT + BT + FR) +
@@ -359,7 +359,7 @@ tetrahedron1_geometry_tests =
                       v1 = p1,
                       v2 = p2,
                       v3 = p3,
-                      fv = empty_values,
+                      function_values = empty_values,
                       precomputed_volume = 0 }
 
     volume1 :: Assertion
@@ -394,7 +394,7 @@ tetrahedron2_geometry_tests =
                       v1 = p1,
                       v2 = p2,
                       v3 = p3,
-                      fv = empty_values,
+                      function_values = empty_values,
                       precomputed_volume = 0 }
 
     volume1 :: Assertion
@@ -433,7 +433,7 @@ containment_tests =
                           v1 = p1,
                           v2 = p2,
                           v3 = p3,
-                          fv = empty_values,
+                          function_values = empty_values,
                           precomputed_volume = 0 }
         contained = contains_point t exterior_point
 
@@ -448,7 +448,7 @@ containment_tests =
                           v1 = p1,
                           v2 = p2,
                           v3 = p3,
-                          fv = empty_values,
+                          function_values = empty_values,
                           precomputed_volume = 0 }
         contained = contains_point t exterior_point
 
@@ -463,7 +463,7 @@ containment_tests =
                           v1 = p1,
                           v2 = p2,
                           v3 = p3,
-                          fv = empty_values,
+                          function_values = empty_values,
                           precomputed_volume = 0 }
         contained = contains_point t exterior_point
 
@@ -478,7 +478,7 @@ containment_tests =
                           v1 = p1,
                           v2 = p2,
                           v3 = p3,
-                          fv = empty_values,
+                          function_values = empty_values,
                           precomputed_volume = 0 }
         contained = contains_point t exterior_point