diff options
Diffstat (limited to 'packages/base')
-rw-r--r-- | packages/base/CHANGELOG | 2 | ||||
-rw-r--r-- | packages/base/src/Numeric/HMatrix.hs | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/base/CHANGELOG b/packages/base/CHANGELOG index a91719d..6b63de8 100644 --- a/packages/base/CHANGELOG +++ b/packages/base/CHANGELOG | |||
@@ -28,6 +28,8 @@ | |||
28 | * "dot" now conjugates the first input vector. | 28 | * "dot" now conjugates the first input vector. |
29 | 29 | ||
30 | * Added "udot" (unconjugated dot product). | 30 | * Added "udot" (unconjugated dot product). |
31 | |||
32 | * Added "sortVector" | ||
31 | 33 | ||
32 | * Added Monoid instance for Matrix using matrix product. | 34 | * Added Monoid instance for Matrix using matrix product. |
33 | 35 | ||
diff --git a/packages/base/src/Numeric/HMatrix.hs b/packages/base/src/Numeric/HMatrix.hs index 34f4346..1b6c1ea 100644 --- a/packages/base/src/Numeric/HMatrix.hs +++ b/packages/base/src/Numeric/HMatrix.hs | |||
@@ -27,7 +27,7 @@ Experimental interface with statically checked dimensions. | |||
27 | 27 | ||
28 | module Numeric.HMatrix( | 28 | module Numeric.HMatrix( |
29 | -- * Vector | 29 | -- * Vector |
30 | R, | 30 | ℝ, R, |
31 | vec2, vec3, vec4, (&), (#), split, headTail, | 31 | vec2, vec3, vec4, (&), (#), split, headTail, |
32 | vector, | 32 | vector, |
33 | linspace, range, dim, | 33 | linspace, range, dim, |
@@ -35,7 +35,7 @@ module Numeric.HMatrix( | |||
35 | L, Sq, build, | 35 | L, Sq, build, |
36 | row, col, (¦),(——), splitRows, splitCols, | 36 | row, col, (¦),(——), splitRows, splitCols, |
37 | unrow, uncol, | 37 | unrow, uncol, |
38 | 38 | tr, | |
39 | eye, | 39 | eye, |
40 | diag, | 40 | diag, |
41 | blockAt, | 41 | blockAt, |
@@ -76,7 +76,7 @@ ud1 (R (Dim v)) = v | |||
76 | 76 | ||
77 | 77 | ||
78 | infixl 4 & | 78 | infixl 4 & |
79 | (&) :: forall n . KnownNat n | 79 | (&) :: forall n . (KnownNat n, 1 <= n) |
80 | => R n -> ℝ -> R (n+1) | 80 | => R n -> ℝ -> R (n+1) |
81 | u & x = u # (konst x :: R 1) | 81 | u & x = u # (konst x :: R 1) |
82 | 82 | ||