diff options
Diffstat (limited to 'packages/base/src/Numeric/LinearAlgebra')
6 files changed, 7 insertions, 18 deletions
diff --git a/packages/base/src/Numeric/LinearAlgebra/Algorithms.hs b/packages/base/src/Numeric/LinearAlgebra/Algorithms.hs index 92761be..063bfc9 100644 --- a/packages/base/src/Numeric/LinearAlgebra/Algorithms.hs +++ b/packages/base/src/Numeric/LinearAlgebra/Algorithms.hs | |||
@@ -81,7 +81,7 @@ import Data.Packed | |||
81 | import Numeric.LinearAlgebra.LAPACK as LAPACK | 81 | import Numeric.LinearAlgebra.LAPACK as LAPACK |
82 | import Data.List(foldl1') | 82 | import Data.List(foldl1') |
83 | import Data.Array | 83 | import Data.Array |
84 | import Data.Packed.Numeric | 84 | import Data.Packed.Internal.Numeric |
85 | 85 | ||
86 | 86 | ||
87 | {- | Generic linear algebra functions for double precision real and complex matrices. | 87 | {- | Generic linear algebra functions for double precision real and complex matrices. |
diff --git a/packages/base/src/Numeric/LinearAlgebra/Base.hs b/packages/base/src/Numeric/LinearAlgebra/Base.hs index 1af4711..395c84a 100644 --- a/packages/base/src/Numeric/LinearAlgebra/Base.hs +++ b/packages/base/src/Numeric/LinearAlgebra/Base.hs | |||
@@ -129,7 +129,7 @@ import Numeric.LinearAlgebra.Data | |||
129 | 129 | ||
130 | import Numeric.Matrix() | 130 | import Numeric.Matrix() |
131 | import Numeric.Vector() | 131 | import Numeric.Vector() |
132 | import Numeric.Container | 132 | import Data.Packed.Numeric |
133 | import Numeric.LinearAlgebra.Algorithms | 133 | import Numeric.LinearAlgebra.Algorithms |
134 | import Numeric.LinearAlgebra.Util | 134 | import Numeric.LinearAlgebra.Util |
135 | 135 | ||
diff --git a/packages/base/src/Numeric/LinearAlgebra/Data.hs b/packages/base/src/Numeric/LinearAlgebra/Data.hs index 3bc88f9..2754576 100644 --- a/packages/base/src/Numeric/LinearAlgebra/Data.hs +++ b/packages/base/src/Numeric/LinearAlgebra/Data.hs | |||
@@ -61,8 +61,7 @@ module Numeric.LinearAlgebra.Data( | |||
61 | 61 | ||
62 | import Data.Packed.Vector | 62 | import Data.Packed.Vector |
63 | import Data.Packed.Matrix | 63 | import Data.Packed.Matrix |
64 | import Numeric.Container | 64 | import Data.Packed.Numeric |
65 | import Data.Packed.IO | ||
66 | import Numeric.LinearAlgebra.Util | 65 | import Numeric.LinearAlgebra.Util |
67 | import Data.Complex | 66 | import Data.Complex |
68 | 67 | ||
diff --git a/packages/base/src/Numeric/LinearAlgebra/Devel.hs b/packages/base/src/Numeric/LinearAlgebra/Devel.hs index c41db2d..b5ef60d 100644 --- a/packages/base/src/Numeric/LinearAlgebra/Devel.hs +++ b/packages/base/src/Numeric/LinearAlgebra/Devel.hs | |||
@@ -60,7 +60,7 @@ module Numeric.LinearAlgebra.Devel( | |||
60 | import Data.Packed.Foreign | 60 | import Data.Packed.Foreign |
61 | import Data.Packed.Development | 61 | import Data.Packed.Development |
62 | import Data.Packed.ST | 62 | import Data.Packed.ST |
63 | import Numeric.Container(Container,Contraction,LSDiv,Product, | 63 | import Data.Packed.Numeric(Container,Contraction,LSDiv,Product, |
64 | Complexable(),RealElement(), | 64 | Complexable(),RealElement(), |
65 | RealOf, ComplexOf, SingleOf, DoubleOf, IndexOf) | 65 | RealOf, ComplexOf, SingleOf, DoubleOf, IndexOf) |
66 | import Data.Packed | 66 | import Data.Packed |
diff --git a/packages/base/src/Numeric/LinearAlgebra/Util.hs b/packages/base/src/Numeric/LinearAlgebra/Util.hs index f0470ab..440f6d1 100644 --- a/packages/base/src/Numeric/LinearAlgebra/Util.hs +++ b/packages/base/src/Numeric/LinearAlgebra/Util.hs | |||
@@ -45,25 +45,15 @@ module Numeric.LinearAlgebra.Util( | |||
45 | vec, | 45 | vec, |
46 | vech, | 46 | vech, |
47 | dup, | 47 | dup, |
48 | vtrans, | 48 | vtrans |
49 | {- -- * Plot | ||
50 | mplot, | ||
51 | plot, parametricPlot, | ||
52 | splot, mesh, meshdom, | ||
53 | matrixToPGM, imshow, | ||
54 | gnuplotX, gnuplotpdf, gnuplotWin | ||
55 | -} | ||
56 | ) where | 49 | ) where |
57 | 50 | ||
58 | import Numeric.Container | 51 | import Data.Packed.Numeric |
59 | import Data.Packed.IO | ||
60 | import Numeric.LinearAlgebra.Algorithms hiding (i) | 52 | import Numeric.LinearAlgebra.Algorithms hiding (i) |
61 | import Numeric.Matrix() | 53 | import Numeric.Matrix() |
62 | import Numeric.Vector() | 54 | import Numeric.Vector() |
63 | 55 | ||
64 | import Numeric.LinearAlgebra.Util.Convolution | 56 | import Numeric.LinearAlgebra.Util.Convolution |
65 | --import Graphics.Plot | ||
66 | |||
67 | 57 | ||
68 | {- | print a real matrix with given number of digits after the decimal point | 58 | {- | print a real matrix with given number of digits after the decimal point |
69 | 59 | ||
diff --git a/packages/base/src/Numeric/LinearAlgebra/Util/Convolution.hs b/packages/base/src/Numeric/LinearAlgebra/Util/Convolution.hs index 1775f14..3cad8d7 100644 --- a/packages/base/src/Numeric/LinearAlgebra/Util/Convolution.hs +++ b/packages/base/src/Numeric/LinearAlgebra/Util/Convolution.hs | |||
@@ -16,7 +16,7 @@ module Numeric.LinearAlgebra.Util.Convolution( | |||
16 | corr2, conv2, separable | 16 | corr2, conv2, separable |
17 | ) where | 17 | ) where |
18 | 18 | ||
19 | import Numeric.Container | 19 | import Data.Packed.Numeric |
20 | 20 | ||
21 | 21 | ||
22 | vectSS :: Element t => Int -> Vector t -> Matrix t | 22 | vectSS :: Element t => Int -> Vector t -> Matrix t |