code refactoring

1 files changed, 28 insertions, 1 deletions

diff --git a/lib/LinearAlgebra/Linear.hs b/lib/LinearAlgebra/Linear.hs
index a2071ed..148bbd3 100644
--- a/lib/LinearAlgebra/Linear.hs
+++ b/lib/LinearAlgebra/Linear.hs
@@ -15,7 +15,8 @@ Portability :  uses ffi
 
 module LinearAlgebra.Linear (
     Linear(..),
-    multiply, dot, outer
+    dot, outer,
+    Mul(..)
 ) where
 
 
@@ -27,10 +28,12 @@ import Complex
 
 class (Field e) => Linear c e where
     scale       :: e -> c e -> c e
+    scaleRecip  :: e -> c e -> c e
     addConstant :: e -> c e -> c e
     add         :: c e -> c e -> c e
     sub         :: c e -> c e -> c e
     mul         :: c e -> c e -> c e
+    divide      :: c e -> c e -> c e
     toComplex   :: RealFloat e => (c e, c e) -> c (Complex e)
     fromComplex :: RealFloat e => c (Complex e) -> (c e, c e)
     comp        :: RealFloat e => c e -> c (Complex e)
@@ -38,10 +41,12 @@ class (Field e) => Linear c e where
 
 instance Linear Vector Double where
     scale = vectorMapValR Scale
+    scaleRecip = vectorMapValR Recip
     addConstant = vectorMapValR AddConstant
     add = vectorZipR Add
     sub = vectorZipR Sub
     mul = vectorZipR Mul
+    divide = vectorZipR Div
     toComplex = Data.Packed.Internal.toComplex
     fromComplex = Data.Packed.Internal.fromComplex
     comp = Data.Packed.Internal.comp
@@ -49,10 +54,12 @@ instance Linear Vector Double where
 
 instance Linear Vector (Complex Double) where
     scale = vectorMapValC Scale
+    scaleRecip = vectorMapValC Recip
     addConstant = vectorMapValC AddConstant
     add = vectorZipC Add
     sub = vectorZipC Sub
     mul = vectorZipC Mul
+    divide = vectorZipC Div
     toComplex = undefined -- can't match
     fromComplex = undefined
     comp = undefined
@@ -60,10 +67,12 @@ instance Linear Vector (Complex Double) where
 
 instance Linear Matrix Double where
     scale x = liftMatrix (scale x)
+    scaleRecip x = liftMatrix (scaleRecip x)
     addConstant x = liftMatrix (addConstant x)
     add = liftMatrix2 add
     sub = liftMatrix2 sub
     mul = liftMatrix2 mul
+    divide = liftMatrix2 divide
     toComplex = uncurry $ liftMatrix2 $ curry LinearAlgebra.Linear.toComplex
     fromComplex z = (reshape c r, reshape c i)
         where (r,i) = LinearAlgebra.Linear.fromComplex (cdat z)
@@ -73,10 +82,12 @@ instance Linear Matrix Double where
 
 instance Linear Matrix (Complex Double) where
     scale x = liftMatrix (scale x)
+    scaleRecip x = liftMatrix (scaleRecip x)
     addConstant x = liftMatrix (addConstant x)
     add = liftMatrix2 add
     sub = liftMatrix2 sub
     mul = liftMatrix2 mul
+    divide = liftMatrix2 divide
     toComplex = undefined
     fromComplex = undefined
     comp = undefined
@@ -102,3 +113,19 @@ dot u v = dat (multiply r c) `at` 0
 -}
 outer :: (Field t) => Vector t -> Vector t -> Matrix t
 outer u v = asColumn u `multiply` asRow v
+
+
+class Mul a b c | a b -> c where
+ infixl 7 <>
+ -- | matrix product
+ (<>) :: Field t => a t -> b t -> c t
+
+instance Mul Matrix Matrix Matrix where
+    (<>) = multiply
+
+instance Mul Matrix Vector Vector where
+    (<>) m v = flatten $ m <> (asColumn v)
+
+instance Mul Vector Matrix Vector where
+    (<>) v m = flatten $ (asRow v) <> m
+