X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FPoint.hs;h=4b9eaece2c88173c7a634899207d877730a99c41;hb=3f7331f579118687cd73b977ce6aa7d401f88a09;hp=a92041e89845147f31af704f53613383c4244ee6;hpb=8b5168ee28e4fd1d5958eabeb00fa6ee06bbfe3b;p=spline3.git

diff --git a/src/Point.hs b/src/Point.hs
index a92041e..4b9eaec 100644
--- a/src/Point.hs
+++ b/src/Point.hs
@@ -1,22 +1,19 @@
-{-# LANGUAGE TypeSynonymInstances #-}
-
-module Point
+{-# LANGUAGE FlexibleInstances #-}
+
+module Point (
+  Point,
+  distance,
+  dot,
+  is_close,
+  scale
+  )
 where
 
-import Comparisons
+import Comparisons ((~=))
 
 
 type Point = (Double, Double, Double)
 
-x_coord :: Point -> Double
-x_coord (x, _, _) = x
-
-y_coord :: Point -> Double
-y_coord (_, y, _) = y
-
-z_coord :: Point -> Double
-z_coord (_, _, z) = z
-
 instance Num Point where
     (x1,y1,z1) + (x2,y2,z2) = (x1+x2, y1+y2, z1+z2)
     (x1,y1,z1) - (x2,y2,z2) = (x1-x2, y1-y2, z1-z2)
@@ -34,14 +31,13 @@ scale (x, y, z) d = (x*d, y*d, z*d)
 -- | Returns the distance between p1 and p2.
 distance :: Point -> Point -> Double
 distance p1 p2 =
-    sqrt $ (x2 - x1)^(2::Int) + (y2 - y1)^(2::Int) + (z2 - z1)^(2::Int)
-    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
+    sqrt $ p1 `dot` p2
+
+
+-- | Returns the dot product of two points (taken as three-vectors).
+dot :: Point -> Point -> Double
+dot (x1, y1, z1) (x2, y2, z2) =
+    (x2 - x1)^(2::Int) + (y2 - y1)^(2::Int) + (z2 - z1)^(2::Int)
 
 
 -- | Returns 'True' if p1 is close to (within 'epsilon' of) p2,