X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FPoint.hs;h=004b2e4498f99920971b9f36a2d3b6aa8d32dc01;hb=c9376729d535a13fc51b0270fe4a9b171888fc7b;hp=95b33640f4e81406f71a685c617a3c273a2a6284;hpb=8e58ac52086db8eedb3d929ddc9b6aa885b67f3f;p=spline3.git

diff --git a/src/Point.hs b/src/Point.hs
index 95b3364..004b2e4 100644
--- a/src/Point.hs
+++ b/src/Point.hs
@@ -1,40 +1,47 @@
 {-# LANGUAGE FlexibleInstances #-}
 
-module Point
+module Point (
+  Point(..),
+  dot,
+  scale )
 where
 
-import Comparisons
+import Test.Tasty.QuickCheck ( Arbitrary( arbitrary ) )
 
 
-type Point = (Double, Double, Double)
+-- | Represents a point in three dimensions. We use a custom type (as
+--   opposed to a 3-tuple) so that we can make the coordinates strict.
+--
+data Point =
+  Point !Double !Double !Double
+  deriving (Eq, Show)
+
+
+instance Arbitrary Point where
+  arbitrary = do
+    (x,y,z) <- arbitrary
+    return $ Point x y 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)
-    (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)
+  (Point x1 y1 z1) + (Point x2 y2 z2) = Point (x1+x2) (y1+y2) (z1+z2)
+  (Point x1 y1 z1) - (Point x2 y2 z2) = Point (x1-x2) (y1-y2) (z1-z2)
+  (Point x1 y1 z1) * (Point x2 y2 z2) = Point (x1*x2) (y1*y2) (z1*z2)
+  abs (Point x y z) = Point (abs x) (abs y) (abs z)
+  signum (Point x y z) = Point (signum x) (signum y) (signum z)
+  fromInteger n =
+    Point coord coord coord
+    where
+      coord = fromInteger n :: Double
 
 
 -- | Scale a point by a constant.
 scale :: Point -> Double -> Point
-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 $ p1 `dot` p2
+scale (Point x y z) d = Point (x*d) (y*d) (z*d)
 
 
 -- | Returns the dot product of two points (taken as three-vectors).
+{-# INLINE dot #-}
 dot :: Point -> Point -> Double
-dot (x1, y1, z1) (x2, y2, z2) =
+dot (Point x1 y1 z1) (Point 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,
---   'False' otherwise.
-is_close :: Point -> Point -> Bool
-is_close p1 p2 = (distance p1 p2) ~= 0