X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FPoint.hs;h=fd3ac58dec3ceef5dfd5c8aa1615e25a9bc0af53;hb=e725cfe579b9d05ac040efc08f1ad47e5060de38;hp=4b9eaece2c88173c7a634899207d877730a99c41;hpb=3f7331f579118687cd73b977ce6aa7d401f88a09;p=spline3.git diff --git a/src/Point.hs b/src/Point.hs index 4b9eaec..fd3ac58 100644 --- a/src/Point.hs +++ b/src/Point.hs @@ -2,16 +2,11 @@ module Point ( Point, - distance, dot, - is_close, scale ) where -import Comparisons ((~=)) - - type Point = (Double, Double, Double) instance Num Point where @@ -28,19 +23,8 @@ 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 - - -- | Returns the dot product of two points (taken as three-vectors). +{-# INLINE dot #-} 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, --- 'False' otherwise. -is_close :: Point -> Point -> Bool -is_close p1 p2 = (distance p1 p2) ~= 0