X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FRealFunction.hs;h=cf98029a5f4948d71375ca0e8c188e19a2d39527;hb=4a7ea6313df073bfd41fd69552a338c7d7cd6f47;hp=5e0832d24d515ea750c7452ee0f2e336d07d4f5b;hpb=89b8b6e94fcc944a1f4611811265f3c6217af850;p=spline3.git

diff --git a/src/RealFunction.hs b/src/RealFunction.hs
index 5e0832d..cf98029 100644
--- a/src/RealFunction.hs
+++ b/src/RealFunction.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TypeSynonymInstances #-}
+{-# LANGUAGE FlexibleInstances #-}
 
 module RealFunction
 where
@@ -6,28 +6,40 @@ where
 
 type RealFunction a = (a -> Double)
 
+
+-- | A 'Show' instance is required to be a 'Num' instance.
 instance Show (RealFunction a) where
-    show _ = "Real Function"
+    -- | There is nothing of value that we can display about a
+    --   function, so simply print its type.
+    show _ = "<RealFunction>"
+
 
+-- | An 'Eq' instance is required to be a 'Num' instance.
 instance Eq (RealFunction a) where
-    _ == _ = False
+    -- | Nothing else makes sense here; always return 'False'.
+    _ == _ = error "You can't compare functions for equality."
 
+
+-- | The 'Num' instance for RealFunction allows us to perform
+--   arithmetic on functions in the usual way.
 instance Num (RealFunction a) where
-    f1 + f2  = \x -> (f1 x) + (f2 x)
-    f1 - f2  = \x -> (f1 x) - (f2 x)
-    f1 * f2  = \x -> (f1 x) * (f2 x)
-    negate f = \x -> -1 * (f x)
-    abs    f = \x -> abs (f x)
-    signum f = \x -> signum (f x)
-    fromInteger i = \_ -> (fromInteger i)    
+    (f1 + f2)  x = (f1 x) + (f2 x)
+    (f1 - f2)  x = (f1 x) - (f2 x)
+    (f1 * f2)  x = (f1 x) * (f2 x)
+    (negate f) x = -1 * (f x)
+    (abs    f) x = abs (f x)
+    (signum f) x = signum (f x)
+    fromInteger i _ = fromInteger i
 
 
--- Takes a constant, and a function as arguments. Returns a new
--- function representing the original function times the constant.
+-- | Takes a constant, and a function as arguments. Returns a new
+--   function representing the original function times the constant.
 cmult :: Double -> (RealFunction a) -> (RealFunction a)
 cmult coeff f = (*coeff) . f
 
--- Takes a function f and an exponent n. Returns a new function, f^n.
+
+-- | Takes a function f and an exponent n. Returns a new function,
+--   f^n.
 fexp :: (RealFunction a) -> Int -> (RealFunction a)
 fexp f n
      | n == 0 = (\_ -> 1)