diff options
author | Alberto Ruiz <aruiz@um.es> | 2015-06-15 12:52:46 +0200 |
---|---|---|
committer | Alberto Ruiz <aruiz@um.es> | 2015-06-15 12:52:46 +0200 |
commit | 7376d022b12a27db5a396f89806a709555c1c522 (patch) | |
tree | f5bab9687cf775185f20dbc22713eddb360b495a /packages/base/src/Numeric/LinearAlgebra/Static.hs | |
parent | 57487d828065ea219cdb33c9dc177b67c60b34c7 (diff) |
documentation, more general cond, remove some unicode, minor changes
Diffstat (limited to 'packages/base/src/Numeric/LinearAlgebra/Static.hs')
-rw-r--r-- | packages/base/src/Numeric/LinearAlgebra/Static.hs | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/packages/base/src/Numeric/LinearAlgebra/Static.hs b/packages/base/src/Numeric/LinearAlgebra/Static.hs index a657bd0..d0a790d 100644 --- a/packages/base/src/Numeric/LinearAlgebra/Static.hs +++ b/packages/base/src/Numeric/LinearAlgebra/Static.hs | |||
@@ -44,7 +44,7 @@ module Numeric.LinearAlgebra.Static( | |||
44 | -- * Complex | 44 | -- * Complex |
45 | C, M, Her, her, 𝑖, | 45 | C, M, Her, her, 𝑖, |
46 | -- * Products | 46 | -- * Products |
47 | (<>),(#>),(<·>), | 47 | (<>),(#>),(<.>), |
48 | -- * Linear Systems | 48 | -- * Linear Systems |
49 | linSolve, (<\>), | 49 | linSolve, (<\>), |
50 | -- * Factorizations | 50 | -- * Factorizations |
@@ -55,13 +55,13 @@ module Numeric.LinearAlgebra.Static( | |||
55 | Disp(..), Domain(..), | 55 | Disp(..), Domain(..), |
56 | withVector, withMatrix, | 56 | withVector, withMatrix, |
57 | toRows, toColumns, | 57 | toRows, toColumns, |
58 | Sized(..), Diag(..), Sym, sym, mTm, unSym | 58 | Sized(..), Diag(..), Sym, sym, mTm, unSym, (<·>) |
59 | ) where | 59 | ) where |
60 | 60 | ||
61 | 61 | ||
62 | import GHC.TypeLits | 62 | import GHC.TypeLits |
63 | import Numeric.LinearAlgebra hiding ( | 63 | import Numeric.LinearAlgebra hiding ( |
64 | (<>),(#>),(<·>),Konst(..),diag, disp,(===),(|||), | 64 | (<>),(#>),(<.>),Konst(..),diag, disp,(===),(|||), |
65 | row,col,vector,matrix,linspace,toRows,toColumns, | 65 | row,col,vector,matrix,linspace,toRows,toColumns, |
66 | (<\>),fromList,takeDiag,svd,eig,eigSH,eigSH', | 66 | (<\>),fromList,takeDiag,svd,eig,eigSH,eigSH', |
67 | eigenvalues,eigenvaluesSH,eigenvaluesSH',build, | 67 | eigenvalues,eigenvaluesSH,eigenvaluesSH',build, |
@@ -207,6 +207,10 @@ infixr 8 <·> | |||
207 | (<·>) :: R n -> R n -> ℝ | 207 | (<·>) :: R n -> R n -> ℝ |
208 | (<·>) = dotR | 208 | (<·>) = dotR |
209 | 209 | ||
210 | infixr 8 <.> | ||
211 | (<.>) :: R n -> R n -> ℝ | ||
212 | (<.>) = dotR | ||
213 | |||
210 | -------------------------------------------------------------------------------- | 214 | -------------------------------------------------------------------------------- |
211 | 215 | ||
212 | class Diag m d | m -> d | 216 | class Diag m d | m -> d |
@@ -496,7 +500,7 @@ appC m v = mkC (extract m LA.#> extract v) | |||
496 | dotC :: KnownNat n => C n -> C n -> ℂ | 500 | dotC :: KnownNat n => C n -> C n -> ℂ |
497 | dotC (unwrap -> u) (unwrap -> v) | 501 | dotC (unwrap -> u) (unwrap -> v) |
498 | | singleV u || singleV v = sumElements (conj u * v) | 502 | | singleV u || singleV v = sumElements (conj u * v) |
499 | | otherwise = u LA.<·> v | 503 | | otherwise = u LA.<.> v |
500 | 504 | ||
501 | 505 | ||
502 | crossC :: C 3 -> C 3 -> C 3 | 506 | crossC :: C 3 -> C 3 -> C 3 |
@@ -584,12 +588,12 @@ test = (ok,info) | |||
584 | where | 588 | where |
585 | q = tm :: L 10 3 | 589 | q = tm :: L 10 3 |
586 | 590 | ||
587 | thingD = vjoin [ud1 u, 1] LA.<·> tr m LA.#> m LA.#> ud1 v | 591 | thingD = vjoin [ud1 u, 1] LA.<.> tr m LA.#> m LA.#> ud1 v |
588 | where | 592 | where |
589 | m = LA.matrix 3 [1..30] | 593 | m = LA.matrix 3 [1..30] |
590 | 594 | ||
591 | precS = (1::Double) + (2::Double) * ((1 :: R 3) * (u & 6)) <·> konst 2 #> v | 595 | precS = (1::Double) + (2::Double) * ((1 :: R 3) * (u & 6)) <·> konst 2 #> v |
592 | precD = 1 + 2 * vjoin[ud1 u, 6] LA.<·> LA.konst 2 (LA.size (ud1 u) +1, LA.size (ud1 v)) LA.#> ud1 v | 596 | precD = 1 + 2 * vjoin[ud1 u, 6] LA.<.> LA.konst 2 (LA.size (ud1 u) +1, LA.size (ud1 v)) LA.#> ud1 v |
593 | 597 | ||
594 | 598 | ||
595 | splittest | 599 | splittest |