X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FPoint.hs;fp=src%2FPoint.hs;h=d8b8dd858fba42d443a61069437484278b0ceb3a;hb=0696fc4f3e428d2156f0be4ca40728abf2e35abe;hp=004b2e4498f99920971b9f36a2d3b6aa8d32dc01;hpb=d47fe5a8e167d8bdc0b4edf2899eee351615ccf8;p=spline3.git diff --git a/src/Point.hs b/src/Point.hs index 004b2e4..d8b8dd8 100644 --- a/src/Point.hs +++ b/src/Point.hs @@ -24,7 +24,7 @@ instance Arbitrary Point where instance Num Point where - (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) (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) @@ -44,4 +44,4 @@ scale (Point x y z) d = Point (x*d) (y*d) (z*d) {-# INLINE dot #-} dot :: Point -> Point -> Double dot (Point x1 y1 z1) (Point x2 y2 z2) = - (x2 - x1)^(2::Int) + (y2 - y1)^(2::Int) + (z2 - z1)^(2::Int) + (x2 - x1) ^ (2::Int) + (y2 - y1) ^ (2::Int) + (z2 - z1) ^ (2::Int)