more refactoring

4 files changed, 29 insertions, 5 deletions

diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index 32dc603..9309d1d 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -28,7 +28,6 @@ import Data.Maybe(fromJust)
 
 data MatrixOrder = RowMajor | ColumnMajor deriving (Show,Eq)
 
--- | 2D array
 data Matrix t = M { rows    :: Int
                   , cols    :: Int
                   , dat     :: Vector t
@@ -44,6 +43,7 @@ fortran m = order m == ColumnMajor
 cdat m = if fortran m `xor` isTrans m then tdat m else dat m
 fdat m = if fortran m `xor` isTrans m then dat m else tdat m
 
+trans :: Matrix t -> Matrix t
 trans m = m { rows = cols m
             , cols = rows m
             , isTrans = not (isTrans m)
@@ -56,6 +56,7 @@ type Mt t s = Int -> Int -> Ptr t -> s
 
 mat d m f = f (rows m) (cols m) (ptr (d m))
 
+toLists :: (Storable t) => Matrix t -> [[t]]
 toLists m = partit (cols m) . toList . cdat $ m
 
 instance (Show a, Storable a) => (Show (Matrix a)) where
@@ -92,6 +93,7 @@ createMatrix order r c = do
     p <- createVector (r*c)
     return (matrixFromVector order c p)
 
+reshape :: (Field t) => Int -> Vector t -> Matrix t
 reshape c v = matrixFromVector RowMajor c v
 
 singleton x = reshape 1 (fromList [x])
@@ -133,8 +135,10 @@ transdata c1 d c2 | isReal baseOf d = scast $ transdataR c1 (scast d) c2
 --{-# RULES "transdataC" transdata=transdataC #-}
 
 -----------------------------------------------------------------
-
+liftMatrix :: (Vector a -> Vector b) -> Matrix a -> Matrix b
 liftMatrix f m = m { dat = f (dat m), tdat = f (tdat m) } -- check sizes
+
+liftMatrix2 :: (Field t) => (Vector a -> Vector b -> Vector t) -> Matrix a -> Matrix b -> Matrix t
 liftMatrix2 f m1 m2 = reshape (cols m1) (f (cdat m1) (cdat m2)) -- check sizes
 
 ------------------------------------------------------------------
@@ -196,10 +200,12 @@ multiplyD order a b
 
 outer' u v = dat (outer u v)
 
+outer :: (Num t, Field t) => Vector t -> Vector t -> Matrix t
 outer u v = multiply RowMajor r c
     where r = matrixFromVector RowMajor 1 u
           c = matrixFromVector RowMajor (dim v) v
 
+dot :: (Field t, Num t) => Vector t -> Vector t -> t
 dot u v = dat (multiply RowMajor r c) `at` 0
     where r = matrixFromVector RowMajor (dim u) u
           c = matrixFromVector RowMajor 1 v
diff --git a/lib/Data/Packed/Matrix.hs b/lib/Data/Packed/Matrix.hs
index c7d5cfa..0f9d998 100644
--- a/lib/Data/Packed/Matrix.hs
+++ b/lib/Data/Packed/Matrix.hs
@@ -14,8 +14,8 @@
 
 module Data.Packed.Matrix (
     Matrix(rows,cols), Field,
-    toLists, (><), (>|<), (@@>),
-    trans,
+    fromLists, toLists, (><), (>|<), (@@>),
+    trans, conjTrans,
     reshape, flatten,
     fromRows, toRows, fromColumns, toColumns,
     joinVert, joinHoriz,
@@ -29,6 +29,9 @@ module Data.Packed.Matrix (
 ) where
 
 import Data.Packed.Internal
+import Foreign(Storable)
+import Complex
+import Data.Packed.Vector
 
 -- | creates a matrix from a vertical list of matrices
 joinVert :: Field t => [Matrix t] -> Matrix t
@@ -50,6 +53,7 @@ fliprl m = fromColumns . reverse . toColumns $ m
 
 ------------------------------------------------------------
 
+diagRect :: (Field t, Num t) => Vector t -> Int -> Int -> Matrix t
 diagRect s r c
     | dim s < min r c = error "diagRect"
     | r == c    = diag s
@@ -57,16 +61,20 @@ diagRect s r c
     | r > c     = joinVert  [diag s , zeros (r-c,c)]
     where zeros (r,c) = reshape c $ constant 0 (r*c)
 
+takeDiag :: (Storable t) => Matrix t -> Vector t
 takeDiag m = fromList [cdat m `at` (k*cols m+k) | k <- [0 .. min (rows m) (cols m) -1]]
 
+ident :: (Num t, Field t) => Int -> Matrix t
 ident n = diag (constant 1 n)
 
+(><) :: (Field a) => Int -> Int -> [a] -> Matrix a
 r >< c = f where
     f l | dim v == r*c = matrixFromVector RowMajor c v
         | otherwise    = error $ "inconsistent list size = "
                                  ++show (dim v) ++"in ("++show r++"><"++show c++")"
         where v = fromList l
 
+(>|<) :: (Field a) => Int -> Int -> [a] -> Matrix a
 r >|< c = f where
     f l | dim v == r*c = matrixFromVector ColumnMajor c v
         | otherwise    = error $ "inconsistent list size = "
@@ -90,4 +98,12 @@ dropColumns n mat = subMatrix (0,n) (rows mat, cols mat - n) mat
 
 ----------------------------------------------------------------
 
+flatten :: Matrix t -> Vector t
 flatten = cdat
+
+-- | Creates a 'Matrix' from a list of lists (considered as rows).
+fromLists :: Field t => [[t]] -> Matrix t
+fromLists = fromRows . map fromList
+
+conjTrans :: Matrix (Complex Double) -> Matrix (Complex Double)
+conjTrans = trans . liftMatrix conj
\ No newline at end of file
diff --git a/lib/Data/Packed/Plot.hs b/lib/Data/Packed/Plot.hs
index 9eddc9f..a0a4aae 100644
--- a/lib/Data/Packed/Plot.hs
+++ b/lib/Data/Packed/Plot.hs
@@ -51,7 +51,7 @@ toFile filename matrix = writeFile filename (unlines . map unwords. map (map sho
 meshdom :: Vector Double -> Vector Double -> (Matrix Double , Matrix Double)
 meshdom r1 r2 = (outer r1 (constant 1 (size r2)), outer (constant 1 (size r1)) r2)
 
-
+gnuplotX :: String -> IO ()
 gnuplotX command = do {system cmdstr; return()} where
     cmdstr = "echo \""++command++"\" | gnuplot -persist"
 
@@ -72,6 +72,7 @@ mesh m = gnuplotX (command++dat) where
     command = "splot "++datafollows++" matrix with lines\n"
     dat = prep $ toLists $ m
 
+mesh' :: Matrix Double -> IO ()
 mesh' m = do
     writeFile "splot-gnu-command" "splot \"splot-tmp.txt\" matrix with lines; pause -1"; 
     toFile "splot-tmp.txt" m
diff --git a/lib/Data/Packed/Vector.hs b/lib/Data/Packed/Vector.hs
index aa1b489..9d9d879 100644
--- a/lib/Data/Packed/Vector.hs
+++ b/lib/Data/Packed/Vector.hs
@@ -36,6 +36,7 @@ conj :: Vector (Complex Double) -> Vector (Complex Double)
 conj v = asComplex $ cdat $ reshape 2 (asReal v) `mulC` diag (fromList [1,-1])
     where mulC = multiply RowMajor
 
+comp :: Vector Double -> Vector (Complex Double)
 comp v = toComplex (v,constant 0 (dim v))
 
 {- | Creates a real vector containing a range of values: