type classes

2 files changed, 5 insertions, 33 deletions

diff --git a/lib/GSL/Compat.hs b/lib/GSL/Compat.hs
index 560a7d8..809a1f5 100644
--- a/lib/GSL/Compat.hs
+++ b/lib/GSL/Compat.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
+{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances #-}
 -----------------------------------------------------------------------------
 {- |
 Module      :  GSL.Compat
@@ -23,6 +23,7 @@ import Data.Packed.Internal hiding (dsp)
 import Data.Packed.Vector
 import Data.Packed.Matrix
 import GSL.Vector
+import LinearAlgebra.Linear
 import GSL.Matrix
 import LinearAlgebra.Algorithms
 import Complex
@@ -49,7 +50,7 @@ compat' m1 m2 = rows m1 == 1 && cols m1 == 1
 instance (Eq a, Field a) => Eq (Vector a) where
     a == b = dim a == dim b && toList a == toList b
 
-instance (Num a, Field a) => Num (Vector a) where
+instance (Linear Vector a) => Num (Vector a) where
     (+) = adaptScalar addConstant add (flip addConstant)
     negate = scale (-1)
     (*) = adaptScalar scale mul (flip scale)
@@ -60,7 +61,7 @@ instance (Num a, Field a) => Num (Vector a) where
 instance (Eq a, Field a) => Eq (Matrix a) where
     a == b = rows a == rows b && cols a == cols b && cdat a == cdat b && fdat a == fdat b
 
-instance (Num a, Field a) => Num (Matrix a) where
+instance (Field a, Linear Vector a) => Num (Matrix a) where
     (+) = liftMatrix2' (+)
     negate = liftMatrix negate
     (*) = liftMatrix2' (*)
diff --git a/lib/GSL/Vector.hs b/lib/GSL/Vector.hs
index 0b3c3a9..b405ff8 100644
--- a/lib/GSL/Vector.hs
+++ b/lib/GSL/Vector.hs
@@ -17,8 +17,7 @@ module GSL.Vector (
     FunCodeS(..), toScalarR,
     FunCodeV(..), vectorMapR, vectorMapC,
     FunCodeSV(..), vectorMapValR, vectorMapValC,
-    FunCodeVV(..), vectorZipR, vectorZipC,
-    scale, addConstant, add, sub, mul,
+    FunCodeVV(..), vectorZipR, vectorZipC
 ) where
 
 import Data.Packed.Internal.Common
@@ -70,34 +69,6 @@ data FunCodeS = Norm2
               | Min
               deriving Enum
 
-
-scale :: (Num a, Field a) => a -> Vector a -> Vector a
-scale x v | isReal baseOf v = scast $ vectorMapValR Scale (scast x) (scast v)
-          | isComp baseOf v = scast $ vectorMapValC Scale (scast x) (scast v)
-          | otherwise   = fromList $ map (*x) $ toList v
-
-addConstant :: (Num a, Field a) => a -> Vector a -> Vector a
-addConstant x v | isReal baseOf v = scast $ vectorMapValR AddConstant (scast x) (scast v)
-                | isComp baseOf v = scast $ vectorMapValC AddConstant (scast x) (scast v)
-                | otherwise   = fromList $ map (*x) $ toList v
-
-add :: (Num a, Field a) => Vector a -> Vector a -> Vector a
-add u v | isReal baseOf v = scast $ vectorZipR Add (scast u) (scast v)
-                | isComp baseOf v = scast $ vectorZipC Add (scast u) (scast v)
-                | otherwise   = fromList $ zipWith (+) (toList u) (toList v)
-
-sub :: (Num a, Field a) => Vector a -> Vector a -> Vector a
-sub u v | isReal baseOf v = scast $ vectorZipR Sub (scast u) (scast v)
-                | isComp baseOf v = scast $ vectorZipC Sub (scast u) (scast v)
-                | otherwise   = fromList $ zipWith (-) (toList u) (toList v)
-
-mul :: (Num a, Field a) => Vector a -> Vector a -> Vector a
-mul u v | isReal baseOf v = scast $ vectorZipR Mul (scast u) (scast v)
-                | isComp baseOf v = scast $ vectorZipC Mul (scast u) (scast v)
-                | otherwise   = fromList $ zipWith (*) (toList u) (toList v)
-
-
-
 ------------------------------------------------------------------
 
 toScalarAux fun code v = unsafePerformIO $ do