7 files changed, 50 insertions, 17 deletions

diff --git a/packages/base/hmatrix.cabal b/packages/base/hmatrix.cabal
index 5f3c48e..1948897 100644
--- a/packages/base/hmatrix.cabal
+++ b/packages/base/hmatrix.cabal
@@ -46,6 +46,8 @@ library
                         Numeric.LinearAlgebra
                         Numeric.LinearAlgebra.Devel
                         Numeric.LinearAlgebra.Data
+
+                        Numeric.LinearAlgebra.Compat
                         
     other-modules:      Data.Packed.Internal,
                         Data.Packed.Internal.Common,
diff --git a/packages/base/src/Numeric/Container.hs b/packages/base/src/Numeric/Container.hs
index c715dac..264a619 100644
--- a/packages/base/src/Numeric/Container.hs
+++ b/packages/base/src/Numeric/Container.hs
@@ -40,6 +40,11 @@ module Numeric.Container (
     optimiseMult,
     mXm,mXv,vXm,LSDiv(..),
     outer, kronecker,
+    -- * Random numbers
+    RandDist(..),
+    randomVector,
+    gaussianSample,
+    uniformSample,
     -- * Element conversion
     Convert(..),
     Complexable(),
@@ -59,6 +64,7 @@ import Data.Complex
 import Numeric.LinearAlgebra.Algorithms(Field,linearSolveSVD)
 import Data.Monoid(Monoid(mconcat))
 import Data.Packed.IO
+import Numeric.LinearAlgebra.Random
 
 ------------------------------------------------------------------
 
diff --git a/packages/base/src/Numeric/LinearAlgebra/Compat.hs b/packages/base/src/Numeric/LinearAlgebra/Compat.hs
new file mode 100644
index 0000000..7b43365
--- /dev/null
+++ b/packages/base/src/Numeric/LinearAlgebra/Compat.hs
@@ -0,0 +1,25 @@
+-----------------------------------------------------------------------------
+{- |
+Module      :  Numeric.LinearAlgebra.Compat
+Copyright   :  (c) Alberto Ruiz 2006-14
+License     :  BSD3
+Maintainer  :  Alberto Ruiz
+Stability   :  provisional
+
+-}
+-----------------------------------------------------------------------------
+{-# OPTIONS_HADDOCK hide #-}
+
+module Numeric.LinearAlgebra.Compat (
+    module Numeric.Container,
+    module Numeric.LinearAlgebra.Algorithms,
+    meanCov
+) where
+
+import Numeric.Container
+import Numeric.LinearAlgebra.Algorithms
+import Numeric.Matrix()
+import Numeric.Vector()
+import Numeric.LinearAlgebra.Util(meanCov)
+
+
diff --git a/packages/base/src/Numeric/LinearAlgebra/Random.hs b/packages/base/src/Numeric/LinearAlgebra/Random.hs
index 7afd658..b66988e 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Random.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Random.hs
@@ -20,7 +20,8 @@ module Numeric.LinearAlgebra.Random (
 ) where
 
 import Numeric.Vectorized
-import Numeric.Container
+import Data.Packed
+import Data.Packed.Internal.Numeric
 import Numeric.LinearAlgebra.Algorithms
 import System.Random(randomIO)
 
diff --git a/packages/gsl/src/Numeric/GSL/Random.hs b/packages/gsl/src/Numeric/GSL/Random.hs
index 2872b17..2594d27 100644
--- a/packages/gsl/src/Numeric/GSL/Random.hs
+++ b/packages/gsl/src/Numeric/GSL/Random.hs
@@ -21,8 +21,12 @@ module Numeric.GSL.Random (
 ) where
 
 import Numeric.GSL.Vector
-import Numeric.Container
-import Numeric.LinearAlgebra(Seed,RandDist(..),cholSH)
+import Numeric.LinearAlgebra(Seed,cholSH)
+import Numeric.Container hiding (
+    randomVector,
+    gaussianSample,
+    uniformSample
+    )
 import System.Random(randomIO)
 
 
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
index e4f0846..55a805a 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
@@ -25,8 +25,9 @@ module Numeric.LinearAlgebra.Tests(
 ) where
 
 --import Data.Packed.Random
-import Numeric.LinearAlgebra
-import Numeric.Container
+import Numeric.LinearAlgebra.Compat
+import Numeric.LinearAlgebra.Util(row,col)
+import Data.Packed
 import Numeric.LinearAlgebra.LAPACK
 import Numeric.LinearAlgebra.Tests.Instances
 import Numeric.LinearAlgebra.Tests.Properties
@@ -67,10 +68,6 @@ a ~~ b = fromList a |~| fromList b
 
 feye n = flipud (ident n) :: Matrix Double
 
-eps = peps :: Double
-
-i = 0 :+ 1 :: Complex Double
-
 
 -----------------------------------------------------------
 
@@ -466,10 +463,10 @@ kroneckerTest = utest "kronecker" ok
     x = (4><2) [3,5..]
     b = (2><5) [0,5..]
     v1 = vec (a <> x <> b)
-    v2 = (trans b `kronecker` a) <> vec x
+    v2 = (trans b `kronecker` a) <.> vec x
     s = trans b <> b
     v3 = vec s
-    v4 = dup 5 <> vech s
+    v4 = (dup 5 :: Matrix Double) <.> vech s
     ok = v1 == v2 && v3 == v4
       && vtrans 1 a == trans a
       && vtrans (rows a) a == asColumn (vec a)
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs
index 81cbf61..70d36e8 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs
@@ -43,9 +43,7 @@ module Numeric.LinearAlgebra.Tests.Properties (
     linearSolveProp, linearSolveProp2
 ) where
 
-import Numeric.LinearAlgebra --hiding (real,complex)
-import Numeric.LinearAlgebra.Devel
-import Numeric.Container
+import Numeric.LinearAlgebra.Compat --hiding (real,complex)
 import Numeric.LinearAlgebra.LAPACK
 import Debug.Trace
 import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector
@@ -95,13 +93,13 @@ positiveDefinite m = minimum (toList e) > 0
 
 upperTriang m = rows m == 1 || down == z
     where down = fromList $ concat $ zipWith drop [1..] (toLists (ctrans m))
-          z = constant 0 (dim down)
+          z = konst 0 (dim down)
 
 upperHessenberg m = rows m < 3 || down == z
     where down = fromList $ concat $ zipWith drop [2..] (toLists (ctrans m))
-          z = constant 0 (dim down)
+          z = konst 0 (dim down)
 
-zeros (r,c) = reshape c (constant 0 (r*c))
+zeros (r,c) = reshape c (konst 0 (r*c))
 
 ones (r,c) = zeros (r,c) + 1