Remove the x_coord, y_coord, and z_coord functions from Point.

[spline3.git] / src / Point.hs

diff --git a/src/Point.hs b/src/Point.hs
index a92041e89845147f31af704f53613383c4244ee6..2b8d59736e28e91a5ce1cc9104e5c131305db3c6 100644 (file)
--- a/src/Point.hs
+++ b/src/Point.hs
@@ -8,15 +8,6 @@ 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)
@@ -33,15 +24,8 @@ 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 =
+distance (x1, y1, z1) (x2, y2, z2) =
     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
 
 
 -- | Returns 'True' if p1 is close to (within 'epsilon' of) p2,