Numeric.Container compatible

3 files changed, 24 insertions, 14 deletions

diff --git a/packages/hmatrix/src/Numeric/Container.hs b/packages/hmatrix/src/Numeric/Container.hs
new file mode 100644
index 0000000..b6e797b
--- /dev/null
+++ b/packages/hmatrix/src/Numeric/Container.hs
@@ -0,0 +1,23 @@
+-----------------------------------------------------------------------------
+{- |
+Module      :  Numeric.Container
+Copyright   :  (c) Alberto Ruiz 2006-14
+License     :  GPL
+Maintainer  :  Alberto Ruiz
+Stability   :  provisional
+
+-}
+-----------------------------------------------------------------------------
+
+module Numeric.Container (
+    module Data.Packed.Numeric,
+    module Numeric.LinearAlgebra.IO,
+    module Numeric.LinearAlgebra.Random,
+    meanCov
+) where
+
+import Data.Packed.Numeric
+import Numeric.LinearAlgebra.IO
+import Numeric.LinearAlgebra.Random hiding (Seed)
+import Numeric.LinearAlgebra.Util(meanCov)
+
diff --git a/packages/hmatrix/src/Numeric/LinearAlgebra.hs b/packages/hmatrix/src/Numeric/LinearAlgebra.hs
index 1c2b1bb..71ed808 100644
--- a/packages/hmatrix/src/Numeric/LinearAlgebra.hs
+++ b/packages/hmatrix/src/Numeric/LinearAlgebra.hs
@@ -3,31 +3,18 @@
 Module      :  Numeric.LinearAlgebra
 Copyright   :  (c) Alberto Ruiz 2006-14
 License     :  GPL
-
 Maintainer  :  Alberto Ruiz
 Stability   :  provisional
 
-
-This module reexports all normally required functions for Linear Algebra applications.
-
-It also provides instances of standard classes 'Show', 'Read', 'Eq',
-'Num', 'Fractional', and 'Floating' for 'Vector' and 'Matrix'.
-In arithmetic operations one-component vectors and matrices automatically
-expand to match the dimensions of the other operand.
-
 -}
 -----------------------------------------------------------------------------
 
 module Numeric.LinearAlgebra (
     module Numeric.Container,
     module Numeric.LinearAlgebra.Algorithms,
-    module Numeric.LinearAlgebra.IO,
-    module Numeric.LinearAlgebra.Random
 ) where
 
 import Numeric.Container
 import Numeric.LinearAlgebra.Algorithms
 import Numeric.LinearAlgebra.Util()
-import Numeric.LinearAlgebra.IO
-import Numeric.LinearAlgebra.Random
 
diff --git a/packages/hmatrix/src/Numeric/LinearAlgebra/Random.hs b/packages/hmatrix/src/Numeric/LinearAlgebra/Random.hs
index e9ab2b7..0a82d3f 100644
--- a/packages/hmatrix/src/Numeric/LinearAlgebra/Random.hs
+++ b/packages/hmatrix/src/Numeric/LinearAlgebra/Random.hs
@@ -21,7 +21,7 @@ module Numeric.LinearAlgebra.Random (
 ) where
 
 import Numeric.GSL.LinearAlgebra
-import Numeric.Container
+import Data.Packed.Numeric
 import Numeric.LinearAlgebra.Algorithms
 import System.Random(randomIO)