diff options
Diffstat (limited to 'lib/Data')
-rw-r--r-- | lib/Data/Packed/Matrix.hs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/Data/Packed/Matrix.hs b/lib/Data/Packed/Matrix.hs index 260c1e0..e94d038 100644 --- a/lib/Data/Packed/Matrix.hs +++ b/lib/Data/Packed/Matrix.hs | |||
@@ -16,10 +16,11 @@ | |||
16 | module Data.Packed.Matrix ( | 16 | module Data.Packed.Matrix ( |
17 | Field, | 17 | Field, |
18 | Matrix,rows,cols, | 18 | Matrix,rows,cols, |
19 | (><), reshape, flatten, | 19 | (><), |
20 | trans, | ||
21 | reshape, flatten, | ||
20 | fromLists, toLists, | 22 | fromLists, toLists, |
21 | (@@>), | 23 | (@@>), |
22 | trans, conjTrans, | ||
23 | asRow, asColumn, | 24 | asRow, asColumn, |
24 | fromRows, toRows, fromColumns, toColumns, | 25 | fromRows, toRows, fromColumns, toColumns, |
25 | fromBlocks, repmat, | 26 | fromBlocks, repmat, |
@@ -28,7 +29,7 @@ module Data.Packed.Matrix ( | |||
28 | extractRows, | 29 | extractRows, |
29 | ident, diag, diagRect, takeDiag, | 30 | ident, diag, diagRect, takeDiag, |
30 | liftMatrix, liftMatrix2, | 31 | liftMatrix, liftMatrix2, |
31 | format, dispR, readMatrix, fromFile, fromArray2D | 32 | format, readMatrix, fromFile, fromArray2D |
32 | ) where | 33 | ) where |
33 | 34 | ||
34 | import Data.Packed.Internal | 35 | import Data.Packed.Internal |
@@ -154,10 +155,6 @@ flatten = cdat | |||
154 | fromLists :: Field t => [[t]] -> Matrix t | 155 | fromLists :: Field t => [[t]] -> Matrix t |
155 | fromLists = fromRows . map fromList | 156 | fromLists = fromRows . map fromList |
156 | 157 | ||
157 | -- | conjugate transpose | ||
158 | conjTrans :: Matrix (Complex Double) -> Matrix (Complex Double) | ||
159 | conjTrans = trans . liftMatrix conj | ||
160 | |||
161 | -- | creates a 1-row matrix from a vector | 158 | -- | creates a 1-row matrix from a vector |
162 | asRow :: Field a => Vector a -> Matrix a | 159 | asRow :: Field a => Vector a -> Matrix a |
163 | asRow v = reshape (dim v) v | 160 | asRow v = reshape (dim v) v |