From 8b5168ee28e4fd1d5958eabeb00fa6ee06bbfe3b Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 8 Jul 2011 23:33:12 -0400 Subject: [PATCH] Fix some hlint warnings. --- src/Main.hs | 30 +----------------------------- src/Point.hs | 30 +++--------------------------- 2 files changed, 4 insertions(+), 56 deletions(-) diff --git a/src/Main.hs b/src/Main.hs index a2d6b1f..c4204c8 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -24,32 +24,4 @@ where -- poly = polynomial target_tetrahedron main :: IO () -main = do - putStrLn "Hello, World." - -- print $ find_point_value (0,0,0) - -- print $ find_point_value (1,0,0) - -- print $ find_point_value (2,0,0) - -- print $ find_point_value (0,1,0) - -- print $ find_point_value (1,1,0) - -- print $ find_point_value (2,1,0) - -- print $ find_point_value (0,2,0) - -- print $ find_point_value (1,2,0) - -- print $ find_point_value (2,2,0) - -- print $ find_point_value (0,0,1) - -- print $ find_point_value (1,0,1) - -- print $ find_point_value (2,0,1) - -- print $ find_point_value (0,1,1) - -- print $ find_point_value (1,1,1) - -- print $ find_point_value (2,1,1) - -- print $ find_point_value (0,2,1) - -- print $ find_point_value (1,2,1) - -- print $ find_point_value (2,2,1) - -- print $ find_point_value (0,0,2) - -- print $ find_point_value (1,0,2) - -- print $ find_point_value (2,0,2) - -- print $ find_point_value (0,1,2) - -- print $ find_point_value (1,1,2) - -- print $ find_point_value (2,1,2) - -- print $ find_point_value (0,2,2) - -- print $ find_point_value (1,2,2) - -- print $ find_point_value (2,2,2) +main = putStrLn "Hello, World." diff --git a/src/Point.hs b/src/Point.hs index bf6fe8e..a92041e 100644 --- a/src/Point.hs +++ b/src/Point.hs @@ -18,33 +18,9 @@ z_coord :: Point -> Double z_coord (_, _, z) = z instance Num Point where - p1 + p2 = (x1+x2, y1+y2, z1+z2) - 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 - - p1 - p2 = (x1-x2, y1-y2, z1-z2) - 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 - - p1 * p2 = (x1*x2, y1*y2, z1*z2) - 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 - + (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) -- 2.43.2