From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 29 Sep 2011 21:24:47 +0000 (-0400)
Subject: Fix a naming conflict.
X-Git-Tag: 0.0.1~124
X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=31ec78e6db481a6410486a3279d62ba73ef14528;p=spline3.git

Fix a naming conflict.
---

diff --git a/src/Tetrahedron.hs b/src/Tetrahedron.hs
index b8d4fe6..613b863 100644
--- a/src/Tetrahedron.hs
+++ b/src/Tetrahedron.hs
@@ -72,7 +72,7 @@ instance ThreeDimensional Tetrahedron where
     center (Tetrahedron _ v0' v1' v2' v3' _) =
         (v0' + v1' + v2' + v3') `scale` (1/4)
 
-    contains_point t p =
+    contains_point t p0 =
       b0_unscaled `nearly_ge` 0 &&
       b1_unscaled `nearly_ge` 0 &&
       b2_unscaled `nearly_ge` 0 &&
@@ -82,19 +82,19 @@ instance ThreeDimensional Tetrahedron where
         -- would do if we used the regular b0,..b3 functions.
         b0_unscaled :: Double
         b0_unscaled = volume inner_tetrahedron
-          where inner_tetrahedron = t { v0 = p }
+          where inner_tetrahedron = t { v0 = p0 }
 
         b1_unscaled :: Double
         b1_unscaled = volume inner_tetrahedron
-          where inner_tetrahedron = t { v1 = p }
+          where inner_tetrahedron = t { v1 = p0 }
 
         b2_unscaled :: Double
         b2_unscaled = volume inner_tetrahedron
-          where inner_tetrahedron = t { v2 = p }
+          where inner_tetrahedron = t { v2 = p0 }
 
         b3_unscaled :: Double
         b3_unscaled = volume inner_tetrahedron
-          where inner_tetrahedron = t { v3 = p }
+          where inner_tetrahedron = t { v3 = p0 }
 
 
 polynomial :: Tetrahedron -> (RealFunction Point)