diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/Makefile | 3 | ||||
-rw-r--r-- | packages/base/CHANGELOG | 2 | ||||
-rw-r--r-- | packages/base/src/Numeric/HMatrix.hs | 6 | ||||
-rw-r--r-- | packages/sparse/src/Numeric/LinearAlgebra/Sparse.hs | 2 | ||||
-rw-r--r-- | packages/tests/src/Numeric/LinearAlgebra/Tests.hs | 4 |
5 files changed, 11 insertions, 6 deletions
diff --git a/packages/Makefile b/packages/Makefile index 648c726..9f7a422 100644 --- a/packages/Makefile +++ b/packages/Makefile | |||
@@ -6,4 +6,7 @@ all: | |||
6 | cd $$p; cabal install --force-reinstall --enable-documentation ; cd -; \ | 6 | cd $$p; cabal install --force-reinstall --enable-documentation ; cd -; \ |
7 | fi; \ | 7 | fi; \ |
8 | done | 8 | done |
9 | cd sparse; \ | ||
10 | cabal install --extra-include-dirs=$(MKL) --extra-lib-dirs=$(MKL) \ | ||
11 | --force-reinstall --enable-documentation ; cd -; | ||
9 | 12 | ||
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 | ||
diff --git a/packages/sparse/src/Numeric/LinearAlgebra/Sparse.hs b/packages/sparse/src/Numeric/LinearAlgebra/Sparse.hs index d098535..8608394 100644 --- a/packages/sparse/src/Numeric/LinearAlgebra/Sparse.hs +++ b/packages/sparse/src/Numeric/LinearAlgebra/Sparse.hs | |||
@@ -11,7 +11,7 @@ import Foreign.C.Types(CInt(..)) | |||
11 | import Numeric.LinearAlgebra.Devel | 11 | import Numeric.LinearAlgebra.Devel |
12 | import System.IO.Unsafe(unsafePerformIO) | 12 | import System.IO.Unsafe(unsafePerformIO) |
13 | import Foreign(Ptr) | 13 | import Foreign(Ptr) |
14 | import Numeric.HMatrix | 14 | import Numeric.LinearAlgebra.HMatrix |
15 | import Text.Printf | 15 | import Text.Printf |
16 | import Numeric.LinearAlgebra.Util((~!~)) | 16 | import Numeric.LinearAlgebra.Util((~!~)) |
17 | 17 | ||
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs index cd88a24..ee57cbc 100644 --- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs +++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs | |||
@@ -27,8 +27,8 @@ module Numeric.LinearAlgebra.Tests( | |||
27 | ) where | 27 | ) where |
28 | 28 | ||
29 | import Numeric.LinearAlgebra | 29 | import Numeric.LinearAlgebra |
30 | import Numeric.HMatrix hiding ((<>),linearSolve) | 30 | import Numeric.LinearAlgebra.HMatrix hiding ((<>),linearSolve) |
31 | import Numeric.LinearAlgebra.Real(L) | 31 | import Numeric.HMatrix(L) |
32 | import Numeric.LinearAlgebra.Util(col,row) | 32 | import Numeric.LinearAlgebra.Util(col,row) |
33 | import Data.Packed | 33 | import Data.Packed |
34 | import Numeric.LinearAlgebra.LAPACK | 34 | import Numeric.LinearAlgebra.LAPACK |