2 files changed, 30 insertions, 3 deletions

diff --git a/lib/LinearAlgebra/Algorithms.hs b/lib/LinearAlgebra/Algorithms.hs
index 4ac6dde..192c0d6 100644
--- a/lib/LinearAlgebra/Algorithms.hs
+++ b/lib/LinearAlgebra/Algorithms.hs
@@ -14,7 +14,7 @@ Portability :  uses ffi
 -----------------------------------------------------------------------------
 
 module LinearAlgebra.Algorithms (
-    mXm, mXv, vXm,
+    mXv, vXm,
     inv,
     pinv,
     pinvTol,
@@ -59,7 +59,7 @@ i = 0:+1
 
 -- | matrix product
 mXm :: (Num t, Field t) => Matrix t -> Matrix t -> Matrix t
-mXm = multiply RowMajor
+mXm = multiply
 
 -- | matrix - vector product
 mXv :: (Num t, Field t) => Matrix t -> Vector t -> Vector t
diff --git a/lib/LinearAlgebra/Linear.hs b/lib/LinearAlgebra/Linear.hs
index 5c5bf0d..51b32f5 100644
--- a/lib/LinearAlgebra/Linear.hs
+++ b/lib/LinearAlgebra/Linear.hs
@@ -14,11 +14,15 @@ Portability :  uses ffi
 -----------------------------------------------------------------------------
 
 module LinearAlgebra.Linear (
-    Linear(..)
+    Linear(..),
+    toComplex, comp,
+    conj,
+    multiply, dot, outer
 ) where
 
 
 import Data.Packed.Internal
+import Data.Packed.Matrix
 import GSL.Vector
 import Complex
 
@@ -43,3 +47,26 @@ instance Linear Vector (Complex Double) where
     add = vectorZipC Add
     sub = vectorZipC Sub
     mul = vectorZipC Mul
+
+--------------------------------------------------
+
+
+-- | euclidean inner product
+dot :: (Field t) => Vector t -> Vector t -> t
+dot u v = dat (multiply r c) `at` 0
+    where r = asRow u
+          c = asColumn v
+
+
+
+
+{- | Outer product of two vectors.
+
+@\> 'fromList' [1,2,3] \`outer\` 'fromList' [5,2,3]
+(3><3)
+ [  5.0, 2.0, 3.0
+ , 10.0, 4.0, 6.0
+ , 15.0, 6.0, 9.0 ]@
+-}
+outer :: (Num t, Field t) => Vector t -> Vector t -> Matrix t
+outer u v = asColumn u `multiply` asRow v