diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/base/src/Numeric/LinearAlgebra.hs | 19 | ||||
-rw-r--r-- | packages/base/src/Numeric/LinearAlgebra/Data.hs | 18 | ||||
-rw-r--r-- | packages/base/src/Numeric/LinearAlgebra/Devel.hs | 28 | ||||
-rw-r--r-- | packages/base/src/Numeric/LinearAlgebra/HMatrix.hs | 2 | ||||
-rw-r--r-- | packages/base/src/Numeric/LinearAlgebra/Static.hs | 2 | ||||
-rw-r--r-- | packages/base/src/Numeric/Matrix.hs | 8 | ||||
-rw-r--r-- | packages/base/src/Numeric/Vector.hs | 9 |
7 files changed, 57 insertions, 29 deletions
diff --git a/packages/base/src/Numeric/LinearAlgebra.hs b/packages/base/src/Numeric/LinearAlgebra.hs index 9dd7177..ace47e9 100644 --- a/packages/base/src/Numeric/LinearAlgebra.hs +++ b/packages/base/src/Numeric/LinearAlgebra.hs | |||
@@ -153,14 +153,17 @@ import Numeric.LinearAlgebra.Data | |||
153 | 153 | ||
154 | import Numeric.Matrix() | 154 | import Numeric.Matrix() |
155 | import Numeric.Vector() | 155 | import Numeric.Vector() |
156 | import Data.Packed.Numeric hiding ((<>), mul) | 156 | import Internal.Matrix |
157 | import Numeric.LinearAlgebra.Algorithms hiding (linearSolve,Normed,orth) | 157 | import Internal.Container hiding ((<>)) |
158 | import qualified Numeric.LinearAlgebra.Algorithms as A | 158 | import Internal.Numeric hiding (mul) |
159 | import Numeric.LinearAlgebra.Util | 159 | import Internal.Algorithms hiding (linearSolve,Normed,orth) |
160 | import Numeric.LinearAlgebra.Util.Modular | 160 | import qualified Internal.Algorithms as A |
161 | import Numeric.LinearAlgebra.Random | 161 | import Internal.Util |
162 | import Numeric.Sparse((!#>)) | 162 | import Internal.Modular |
163 | import Numeric.LinearAlgebra.Util.CG | 163 | import Internal.Random |
164 | import Internal.Sparse((!#>)) | ||
165 | import Internal.CG | ||
166 | import Internal.Conversion | ||
164 | 167 | ||
165 | {- | infix synonym of 'mul' | 168 | {- | infix synonym of 'mul' |
166 | 169 | ||
diff --git a/packages/base/src/Numeric/LinearAlgebra/Data.hs b/packages/base/src/Numeric/LinearAlgebra/Data.hs index 2161e75..196ada9 100644 --- a/packages/base/src/Numeric/LinearAlgebra/Data.hs +++ b/packages/base/src/Numeric/LinearAlgebra/Data.hs | |||
@@ -93,12 +93,18 @@ module Numeric.LinearAlgebra.Data( | |||
93 | 93 | ||
94 | ) where | 94 | ) where |
95 | 95 | ||
96 | import Data.Packed.Vector | 96 | import Internal.Tools |
97 | import Data.Packed.Matrix | 97 | import Internal.Vector |
98 | import Data.Packed.Numeric | 98 | import Internal.Vectorized |
99 | import Numeric.LinearAlgebra.Util hiding ((&),(#)) | 99 | import Internal.Matrix hiding (size) |
100 | import Internal.Element | ||
101 | import Internal.IO | ||
102 | import Internal.Numeric | ||
103 | import Internal.Container | ||
104 | import Internal.Util hiding ((&),(#)) | ||
100 | import Data.Complex | 105 | import Data.Complex |
101 | import Numeric.Sparse | 106 | import Internal.Sparse |
102 | import Numeric.LinearAlgebra.Util.Modular | 107 | import Internal.Modular |
108 | import Data.Vector.Storable(fromList) | ||
103 | 109 | ||
104 | 110 | ||
diff --git a/packages/base/src/Numeric/LinearAlgebra/Devel.hs b/packages/base/src/Numeric/LinearAlgebra/Devel.hs index 55894e0..4d5b5cb 100644 --- a/packages/base/src/Numeric/LinearAlgebra/Devel.hs +++ b/packages/base/src/Numeric/LinearAlgebra/Devel.hs | |||
@@ -17,12 +17,22 @@ module Numeric.LinearAlgebra.Devel( | |||
17 | -- | 17 | -- |
18 | -- @ glUniformMatrix4fv 0 1 (fromIntegral gl_TRUE) \`appMatrix\` perspective 0.01 100 (pi\/2) (4\/3) | 18 | -- @ glUniformMatrix4fv 0 1 (fromIntegral gl_TRUE) \`appMatrix\` perspective 0.01 100 (pi\/2) (4\/3) |
19 | -- @ | 19 | -- @ |
20 | module Data.Packed.Foreign, | 20 | module Internal.Foreign, |
21 | 21 | ||
22 | -- * FFI tools | 22 | -- * FFI tools |
23 | -- | Illustrative usage examples can be found | 23 | -- | Illustrative usage examples can be found |
24 | -- in the @examples\/devel@ folder included in the package. | 24 | -- in the @examples\/devel@ folder included in the package. |
25 | module Data.Packed.Development, | 25 | |
26 | createVector, createMatrix, | ||
27 | vec, mat, omat, | ||
28 | app1, app2, app3, app4, | ||
29 | app5, app6, app7, app8, app9, app10, | ||
30 | MatrixOrder(..), orderOf, cmat, fmat, | ||
31 | matrixFromVector, | ||
32 | unsafeFromForeignPtr, | ||
33 | unsafeToForeignPtr, | ||
34 | check, (//), | ||
35 | at', atM', fi, ti, | ||
26 | 36 | ||
27 | -- * ST | 37 | -- * ST |
28 | -- | In-place manipulation inside the ST monad. | 38 | -- | In-place manipulation inside the ST monad. |
@@ -58,9 +68,13 @@ module Numeric.LinearAlgebra.Devel( | |||
58 | 68 | ||
59 | ) where | 69 | ) where |
60 | 70 | ||
61 | import Data.Packed.Foreign | 71 | import Internal.Tools |
62 | import Data.Packed.Development | 72 | import Internal.Foreign |
63 | import Data.Packed.ST | 73 | import Internal.Devel |
64 | import Data.Packed | 74 | import Internal.ST |
65 | import Numeric.Sparse | 75 | import Internal.Vector |
76 | import Internal.Matrix | ||
77 | import Internal.Element | ||
78 | import Internal.Sparse | ||
79 | import Data.Vector.Storable (unsafeToForeignPtr, unsafeFromForeignPtr ) | ||
66 | 80 | ||
diff --git a/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs b/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs index a6383c1..327f284 100644 --- a/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs +++ b/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs | |||
@@ -17,6 +17,6 @@ module Numeric.LinearAlgebra.HMatrix ( | |||
17 | ) where | 17 | ) where |
18 | 18 | ||
19 | import Numeric.LinearAlgebra | 19 | import Numeric.LinearAlgebra |
20 | import Numeric.LinearAlgebra.Util | 20 | import Internal.Util |
21 | 21 | ||
22 | 22 | ||
diff --git a/packages/base/src/Numeric/LinearAlgebra/Static.hs b/packages/base/src/Numeric/LinearAlgebra/Static.hs index 49327f2..04c4151 100644 --- a/packages/base/src/Numeric/LinearAlgebra/Static.hs +++ b/packages/base/src/Numeric/LinearAlgebra/Static.hs | |||
@@ -68,7 +68,7 @@ import Numeric.LinearAlgebra hiding ( | |||
68 | qr,size,app,mul,dot,chol,range) | 68 | qr,size,app,mul,dot,chol,range) |
69 | import qualified Numeric.LinearAlgebra as LA | 69 | import qualified Numeric.LinearAlgebra as LA |
70 | import Data.Proxy(Proxy) | 70 | import Data.Proxy(Proxy) |
71 | import Numeric.LinearAlgebra.Static.Internal | 71 | import Internal.Static |
72 | import Control.Arrow((***)) | 72 | import Control.Arrow((***)) |
73 | 73 | ||
74 | 74 | ||
diff --git a/packages/base/src/Numeric/Matrix.hs b/packages/base/src/Numeric/Matrix.hs index 5f27652..5400f26 100644 --- a/packages/base/src/Numeric/Matrix.hs +++ b/packages/base/src/Numeric/Matrix.hs | |||
@@ -26,11 +26,13 @@ module Numeric.Matrix ( | |||
26 | 26 | ||
27 | ------------------------------------------------------------------- | 27 | ------------------------------------------------------------------- |
28 | 28 | ||
29 | import Data.Packed | 29 | import Internal.Vector |
30 | import Data.Packed.Internal.Numeric | 30 | import Internal.Matrix |
31 | import Internal.Element | ||
32 | import Internal.Numeric | ||
31 | import qualified Data.Monoid as M | 33 | import qualified Data.Monoid as M |
32 | import Data.List(partition) | 34 | import Data.List(partition) |
33 | import Numeric.Chain | 35 | import Internal.Chain |
34 | 36 | ||
35 | ------------------------------------------------------------------- | 37 | ------------------------------------------------------------------- |
36 | 38 | ||
diff --git a/packages/base/src/Numeric/Vector.hs b/packages/base/src/Numeric/Vector.hs index 6245cf7..7525890 100644 --- a/packages/base/src/Numeric/Vector.hs +++ b/packages/base/src/Numeric/Vector.hs | |||
@@ -19,9 +19,12 @@ | |||
19 | 19 | ||
20 | module Numeric.Vector () where | 20 | module Numeric.Vector () where |
21 | 21 | ||
22 | import Numeric.Vectorized | 22 | import Internal.Tools |
23 | import Data.Packed.Vector | 23 | import Internal.Vectorized |
24 | import Data.Packed.Internal.Numeric | 24 | import Internal.Vector |
25 | import Internal.Numeric | ||
26 | import Data.Vector.Storable(fromList) | ||
27 | import Internal.Conversion | ||
25 | 28 | ||
26 | ------------------------------------------------------------------- | 29 | ------------------------------------------------------------------- |
27 | 30 | ||