X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FPoint.hs;h=a92041e89845147f31af704f53613383c4244ee6;hb=46b1f2e3741d6571c2f931371222f8970b6c7f63;hp=94bcd70f6e8c586f28a70e655c6bbd227ba1c801;hpb=58cf11569acb270995d2de924dda03ef526647e2;p=spline3.git

diff --git a/src/Point.hs b/src/Point.hs
index 94bcd70..a92041e 100644
--- a/src/Point.hs
+++ b/src/Point.hs
@@ -18,33 +18,9 @@ z_coord :: Point -> Double
 z_coord (_, _, z) = z
 
 instance Num Point where
-    p1 + p2 = (x1+x2, y1+y2, z1+z2)
-        where
-          x1 = x_coord p1
-          x2 = x_coord p2
-          y1 = y_coord p1
-          y2 = y_coord p2
-          z1 = z_coord p1
-          z2 = z_coord p2
-
-    p1 - p2 = (x1-x2, y1-y2, z1-z2)
-        where
-          x1 = x_coord p1
-          x2 = x_coord p2
-          y1 = y_coord p1
-          y2 = y_coord p2
-          z1 = z_coord p1
-          z2 = z_coord p2
-
-    p1 * p2 = (x1*x2, y1*y2, z1*z2)
-        where
-          x1 = x_coord p1
-          x2 = x_coord p2
-          y1 = y_coord p1
-          y2 = y_coord p2
-          z1 = z_coord p1
-          z2 = z_coord p2
-
+    (x1,y1,z1) + (x2,y2,z2) = (x1+x2, y1+y2, z1+z2)
+    (x1,y1,z1) - (x2,y2,z2) = (x1-x2, y1-y2, z1-z2)
+    (x1,y1,z1) * (x2,y2,z2) = (x1*x2, y1*y2, z1*z2)
     abs (x, y, z) = (abs x, abs y, abs z)
     signum (x, y, z) = (signum x, signum y, signum z)
     fromInteger n = (fromInteger n, fromInteger n, fromInteger n)
@@ -68,6 +44,7 @@ distance p1 p2 =
       z2 = z_coord p2
 
 
--- | Returns 'True' if p1 'is_close' to p2, 'False' otherwise.
+-- | Returns 'True' if p1 is close to (within 'epsilon' of) p2,
+--   'False' otherwise.
 is_close :: Point -> Point -> Bool
 is_close p1 p2 = (distance p1 p2) ~= 0