6 files changed, 156 insertions, 23 deletions

diff --git a/HSSL.cabal b/HSSL.cabal
index 02f5129..b841588 100644
--- a/HSSL.cabal
+++ b/HSSL.cabal
@@ -49,6 +49,7 @@ Exposed-modules:    Data.Packed.Internal,
                     LinearAlgebra,
                     LinearAlgebra.Linear,
                     LinearAlgebra.Instances,
+                    LinearAlgebra.Interface,
                     LinearAlgebra.Algorithms
                     , Graphics.Plot
 --                    , GSLHaskell
diff --git a/lib/Data/Packed/Matrix.hs b/lib/Data/Packed/Matrix.hs
index 4f2ad90..5a4b919 100644
--- a/lib/Data/Packed/Matrix.hs
+++ b/lib/Data/Packed/Matrix.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Packed.Matrix
@@ -21,17 +22,21 @@ module Data.Packed.Matrix (
     trans, conjTrans,
     asRow, asColumn,
     fromRows, toRows, fromColumns, toColumns,
-    fromBlocks, joinVert, joinHoriz,
+    fromBlocks,
     flipud, fliprl,
     subMatrix, takeRows, dropRows, takeColumns, dropColumns,
     ident, diag, diagRect, takeDiag,
     liftMatrix, liftMatrix2,
+    dispR, readMatrix, fromArray2D
 ) where
 
 import Data.Packed.Internal
 import Foreign(Storable)
 import Complex
 import Data.Packed.Vector
+import Numeric(showGFloat)
+import Data.List(transpose,intersperse)
+import Data.Array
 
 -- | creates a matrix from a vertical list of matrices
 joinVert :: Field t => [Matrix t] -> Matrix t
@@ -160,5 +165,47 @@ asRow v = reshape (dim v) v
 asColumn :: Field a => Vector a -> Matrix a
 asColumn v = reshape 1 v
 
-------------------------------------------------
-
+-----------------------------------------------------
+
+fromArray2D :: (Field e) => Array (Int, Int) e -> Matrix e
+fromArray2D m = (r><c) (elems m)
+    where ((r0,c0),(r1,c1)) = bounds m
+          r = r1-r0+1
+          c = c1-c0+1
+
+------------------------------------------------------
+-- shows a Double with n digits after the decimal point    
+shf :: (RealFloat a) => Int -> a -> String     
+shf dec n | abs n < 1e-10 = "0."
+          | abs (n - (fromIntegral.round $ n)) < 1e-10 = show (round n) ++"."
+          | otherwise = showGFloat (Just dec) n ""    
+-- shows a Complex Double as a pair, with n digits after the decimal point    
+shfc n z@ (a:+b) 
+    | magnitude z <1e-10 = "0."
+    | abs b < 1e-10 = shf n a
+    | abs a < 1e-10 = shf n b ++"i"
+    | b > 0         = shf n a ++"+"++shf n b ++"i"
+    | otherwise     = shf n a ++shf n b ++"i"         
+
+dsp' :: String -> [[String]] -> String
+dsp' sep as = unlines . map unwords' $ transpose mtp where 
+    mt = transpose as
+    longs = map (maximum . map length) mt
+    mtp = zipWith (\a b -> map (pad a) b) longs mt
+    pad n str = replicate (n - length str) ' ' ++ str
+    unwords' = concat . intersperse sep
+
+format :: (Field t) => String -> (t -> String) -> Matrix t -> String
+format sep f m = dsp' sep . map (map f) . toLists $ m
+
+disp m f = putStrLn $ "matrix ("++show (rows m) ++"x"++ show (cols m) ++")\n"++format " | " f m
+
+dispR :: Int -> Matrix Double -> IO ()
+dispR d m = disp m (shf d)
+
+dispC :: Int -> Matrix (Complex Double) -> IO ()
+dispC d m = disp m (shfc d)
+
+-- | creates a matrix from a table of numbers.
+readMatrix :: String -> Matrix Double
+readMatrix = fromLists . map (map read). map words . filter (not.null) . lines
diff --git a/lib/LinearAlgebra.hs b/lib/LinearAlgebra.hs
index 3b56fc4..a271592 100644
--- a/lib/LinearAlgebra.hs
+++ b/lib/LinearAlgebra.hs
@@ -16,6 +16,8 @@ module LinearAlgebra (
     module Data.Packed.Vector,
     module Data.Packed.Matrix,
     module LinearAlgebra.Linear,
+    module LinearAlgebra.Instances,
+    module LinearAlgebra.Interface,
     module LAPACK,
     module GSL.Matrix,
     module LinearAlgebra.Algorithms,
@@ -23,6 +25,8 @@ module LinearAlgebra (
 ) where
 
 import LinearAlgebra.Linear
+import LinearAlgebra.Instances
+import LinearAlgebra.Interface
 import LinearAlgebra.Algorithms
 import LAPACK
 import GSL.Matrix
diff --git a/lib/LinearAlgebra/Algorithms.hs b/lib/LinearAlgebra/Algorithms.hs
index 192c0d6..3112ce6 100644
--- a/lib/LinearAlgebra/Algorithms.hs
+++ b/lib/LinearAlgebra/Algorithms.hs
@@ -14,7 +14,7 @@ Portability :  uses ffi
 -----------------------------------------------------------------------------
 
 module LinearAlgebra.Algorithms (
-    mXv, vXm,
+    -- mXv, vXm,
     inv,
     pinv,
     pinvTol,
diff --git a/lib/LinearAlgebra/Interface.hs b/lib/LinearAlgebra/Interface.hs
new file mode 100644
index 0000000..7d6ff0f
--- /dev/null
+++ b/lib/LinearAlgebra/Interface.hs
@@ -0,0 +1,99 @@
+{-# OPTIONS_GHC -fglasgow-exts #-}
+-----------------------------------------------------------------------------
+{- |
+Module      :  LinearAlgebra.Interface
+Copyright   :  (c) Alberto Ruiz 2006
+License     :  GPL-style
+
+Maintainer  :  Alberto Ruiz (aruiz at um dot es)
+Stability   :  provisional
+Portability :  portable
+
+Operators for frequent operations.
+
+-}
+-----------------------------------------------------------------------------
+
+module LinearAlgebra.Interface(
+    (<>),(<.>),
+    (.*),(*/),
+    (<|>),(<->),
+) where
+
+import LinearAlgebra.Linear
+import Data.Packed.Vector
+import Data.Packed.Matrix
+
+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
+
+---------------------------------------------------
+
+-- | @u \<.\> v = dot u v@
+(<.>) :: (Field t) => Vector t -> Vector t -> t
+infixl 7 <.>
+(<.>) = dot
+
+----------------------------------------------------
+
+-- | @x .* a = scale (recip x) v@
+(.*) :: (Linear c a) => a -> c a -> c a
+infixl 7 .*
+a .* x = scale a x
+
+----------------------------------------------------
+
+-- | @a *\/ x = scale (recip x) a@
+(*/) :: (Linear c a) => c a -> a -> c a
+infixl 7 */
+v */ x = scale (recip x) v
+
+------------------------------------------------
+
+class Joinable a b where
+    joinH :: Field t => a t -> b t -> Matrix t
+    joinV :: Field t => a t -> b t -> Matrix t
+
+instance Joinable Matrix Matrix where
+    joinH m1 m2 = fromBlocks [[m1,m2]]
+    joinV m1 m2 = fromBlocks [[m1],[m2]]
+
+instance Joinable Matrix Vector where
+    joinH m v = joinH m (asColumn v)
+    joinV m v = joinV m (asRow v)
+
+instance Joinable Vector Matrix where
+    joinH v m = joinH (asColumn v) m
+    joinV v m = joinV (asRow v) m
+
+infixl 4 <|>
+infixl 3 <->
+
+{- | Horizontal concatenation of matrices and vectors:
+
+@> (ident 3 -&- 3 * ident 3) |&| fromList [1..6.0]
+(6><4)
+ [ 1.0, 0.0, 0.0, 1.0
+ , 0.0, 1.0, 0.0, 2.0
+ , 0.0, 0.0, 1.0, 3.0
+ , 3.0, 0.0, 0.0, 4.0
+ , 0.0, 3.0, 0.0, 5.0
+ , 0.0, 0.0, 3.0, 6.0 ]@
+-}
+(<|>) :: (Field t, Joinable a b) => a t -> b t -> Matrix t
+a <|> b = joinH a b
+
+-- | Vertical concatenation of matrices and vectors.
+(<->) :: (Field t, Joinable a b) => a t -> b t -> Matrix t
+a <-> b = joinV a b
diff --git a/lib/LinearAlgebra/Linear.hs b/lib/LinearAlgebra/Linear.hs
index 148bbd3..c12e30b 100644
--- a/lib/LinearAlgebra/Linear.hs
+++ b/lib/LinearAlgebra/Linear.hs
@@ -15,8 +15,7 @@ Portability :  uses ffi
 
 module LinearAlgebra.Linear (
     Linear(..),
-    dot, outer,
-    Mul(..)
+    multiply, dot, outer
 ) where
 
 
@@ -95,7 +94,6 @@ instance Linear Matrix (Complex Double) where
 
 --------------------------------------------------
 
-
 -- | euclidean inner product
 dot :: (Field t) => Vector t -> Vector t -> t
 dot u v = dat (multiply r c) `at` 0
@@ -113,19 +111,3 @@ 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
-