<\> admits multiple right-hand sides

2 files changed, 20 insertions, 27 deletions

diff --git a/lib/Numeric/Container.hs b/lib/Numeric/Container.hs
index eded19c..661e5b4 100644
--- a/lib/Numeric/Container.hs
+++ b/lib/Numeric/Container.hs
@@ -36,7 +36,7 @@ module Numeric.Container (
     -- * Matrix product
     Product(..),
     optimiseMult,
-    mXm,mXv,vXm,(<.>),Mul(..),(<\>),
+    mXm,mXv,vXm,(<.>),Mul(..),LSDiv(..),
     outer, kronecker,
     -- * Random numbers
     RandDist(..),
@@ -120,9 +120,15 @@ instance Mul Vector Matrix Vector where
 
 --------------------------------------------------------
 
--- | least squares solution of a linear system, similar to the \\ operator of Matlab\/Octave (based on linearSolveSVD).
-(<\>) :: (Field a) => Matrix a -> Vector a -> Vector a
-infixl 7 <\>
-m <\> v = flatten (linearSolveSVD m (reshape 1 v))
+class LSDiv b c | b -> c, c->b where
+ infixl 7 <\>
+ -- | least squares solution of a linear system, similar to the \\ operator of Matlab\/Octave (based on linearSolveSVD)
+ (<\>)  :: Field t => Matrix t -> b t -> c t
+
+instance LSDiv Vector Vector where
+    m <\> v = flatten (linearSolveSVD m (reshape 1 v))
+
+instance LSDiv Matrix Matrix where
+    (<\>) = linearSolveSVD
 
 --------------------------------------------------------
diff --git a/lib/Numeric/LinearAlgebra/Real.hs b/lib/Numeric/LinearAlgebra/Real.hs
index 6cba045..08a218c 100644
--- a/lib/Numeric/LinearAlgebra/Real.hs
+++ b/lib/Numeric/LinearAlgebra/Real.hs
@@ -13,7 +13,7 @@ Additional functions for real arrays.
 -----------------------------------------------------------------------------
 
 module Numeric.LinearAlgebra.Real(
-    (<>), (*>), (<*), (<\>), (\>),
+    (<>), (<\>),
     vector,
     linspace,
     eye,
@@ -22,7 +22,8 @@ module Numeric.LinearAlgebra.Real(
     row,
     col,
     (#),(&), (//), blocks,
-    rand, randn
+    rand, randn,
+    module Numeric.LinearAlgebra
 ) where
 
 import Numeric.LinearAlgebra hiding ((<>), (<\>), linspace)
@@ -34,30 +35,16 @@ linspace = LA.linspace
 
 
 infixl 7 <>
--- | Matrix product ('multiply')
-(<>) :: Field t => Matrix t -> Matrix t -> Matrix t
-(<>) = multiply
+-- | Matrix product
+(<>) ::Mul a b c => a Double -> b Double -> c Double
+(<>) = (LA.<>)
 
-infixl 7 *>
--- | matrix x vector
-(*>) :: Field t => Matrix t -> Vector t -> Vector t
-m *> v = flatten $ m <> (asColumn v)
 
-infixl 7 <*
--- | vector x matrix
-(<*) :: Field t => Vector t -> Matrix t -> Vector t
-v <* m = flatten $ (asRow v) <> m
-
-
--- | Least squares solution of a linear system for several right-hand sides, similar to the \\ operator of Matlab\/Octave. (\<\\\>) = 'linearSolveSVD'.
-(<\>) :: (Field a) => Matrix a -> Matrix a -> Matrix a
 infixl 7 <\>
-(<\>) = linearSolveSVD
+-- | Least squares solution of a linear system
+(<\>) ::LSDiv b c => Matrix Double -> b Double -> c Double
+(<\>) = (LA.<\>)
 
--- | Least squares solution of a linear system for a single right-hand side. See '(\<\\\>)'.
-(\>) :: (Field a) => Matrix a -> Vector a -> Vector a
-infixl 7 \>
-m \> v = flatten (m <\> reshape 1 v)
 
 -- | Pseudorandom matrix with uniform elements between 0 and 1.
 randm :: RandDist