diff options
| author | Alberto Ruiz <aruiz@um.es> | 2012-03-18 12:33:17 +0100 |
|---|---|---|
| committer | Alberto Ruiz <aruiz@um.es> | 2012-03-18 12:33:17 +0100 |
| commit | 1a6d3168d0182b868ac3a87ab69a88f22e03b836 (patch) | |
| tree | f7565da5057a3f00bad57ddbb51fae443d7c8f3b /lib/Numeric/LinearAlgebra | |
| parent | a53bfb617e739627e133c13db42059ec71949160 (diff) | |
change construction operators
Diffstat (limited to 'lib/Numeric/LinearAlgebra')
| -rw-r--r-- | lib/Numeric/LinearAlgebra/Real.hs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/Numeric/LinearAlgebra/Real.hs b/lib/Numeric/LinearAlgebra/Real.hs index 08a218c..8478ee7 100644 --- a/lib/Numeric/LinearAlgebra/Real.hs +++ b/lib/Numeric/LinearAlgebra/Real.hs | |||
| @@ -88,19 +88,19 @@ ones :: Int -- ^ rows | |||
| 88 | ones r c = konst 1 (r,c) | 88 | ones r c = konst 1 (r,c) |
| 89 | 89 | ||
| 90 | -- | Concatenation of real vectors. | 90 | -- | Concatenation of real vectors. |
| 91 | infixl 9 # | 91 | infixl 3 # |
| 92 | (#) :: Vector Double -> Vector Double -> Vector Double | 92 | (#) :: Vector Double -> Vector Double -> Vector Double |
| 93 | a # b = join [a,b] | 93 | a # b = join [a,b] |
| 94 | 94 | ||
| 95 | -- | Horizontal concatenation of real matrices. | 95 | -- | Horizontal concatenation of real matrices. |
| 96 | infixl 8 & | 96 | infixl 3 ! |
| 97 | (&) :: Matrix Double -> Matrix Double -> Matrix Double | 97 | (!) :: Matrix Double -> Matrix Double -> Matrix Double |
| 98 | a & b = fromBlocks [[a,b]] | 98 | a ! b = fromBlocks [[a,b]] |
| 99 | 99 | ||
| 100 | -- | Vertical concatenation of real matrices. | 100 | -- | Vertical concatenation of real matrices. |
| 101 | (//) :: Matrix Double -> Matrix Double -> Matrix Double | 101 | (#) :: Matrix Double -> Matrix Double -> Matrix Double |
| 102 | infixl 7 // | 102 | infixl 2 # |
| 103 | a // b = fromBlocks [[a],[b]] | 103 | a # b = fromBlocks [[a],[b]] |
| 104 | 104 | ||
| 105 | 105 | ||
| 106 | -- | Real block matrix from a rectangular list of lists. | 106 | -- | Real block matrix from a rectangular list of lists. |