meanCov moved to Container

2 files changed, 17 insertions, 15 deletions

diff --git a/lib/Data/Packed/Random.hs b/lib/Data/Packed/Random.hs
index 4b229f0..dabb17d 100644
--- a/lib/Data/Packed/Random.hs
+++ b/lib/Data/Packed/Random.hs
@@ -12,11 +12,11 @@
 -----------------------------------------------------------------------------
 
 module Data.Packed.Random (
+    Seed,
     RandDist(..),
     randomVector,
     gaussianSample,
-    uniformSample,
-    meanCov,
+    uniformSample
 ) where
 
 import Numeric.GSL.Vector
@@ -25,9 +25,11 @@ import Numeric.ContainerBoot
 import Numeric.LinearAlgebra.Algorithms
 
 
+type Seed = Int
+
 -- | Obtains a matrix whose rows are pseudorandom samples from a multivariate
 -- Gaussian distribution.
-gaussianSample :: Int -- ^ seed
+gaussianSample :: Seed
                -> Int -- ^ number of rows
                -> Vector Double -- ^ mean vector
                -> Matrix Double -- ^ covariance matrix
@@ -40,7 +42,7 @@ gaussianSample seed n med cov = m where
 
 -- | Obtains a matrix whose rows are pseudorandom samples from a multivariate
 -- uniform distribution.
-uniformSample :: Int -- ^ seed
+uniformSample :: Seed
                -> Int -- ^ number of rows
                -> [(Double,Double)] -- ^ ranges for each column
                -> Matrix Double -- ^ result
@@ -53,14 +55,3 @@ uniformSample seed n rgs = m where
     am = konst 1 n `outer` a
     m = fromColumns (zipWith scale cs dat) `add` am
 
------------- utilities -------------------------------
-
--- | Compute mean vector and covariance matrix of the rows of a matrix.
-meanCov :: Matrix Double -> (Vector Double, Matrix Double)
-meanCov x = (med,cov) where
-    r    = rows x
-    k    = 1 / fromIntegral r
-    med  = konst k r `vXm` x
-    meds = konst 1 r `outer` med
-    xc   = x `sub` meds
-    cov  = scale (recip (fromIntegral (r-1))) (trans xc `mXm` xc)
diff --git a/lib/Numeric/Container.hs b/lib/Numeric/Container.hs
index 661e5b4..345c1f1 100644
--- a/lib/Numeric/Container.hs
+++ b/lib/Numeric/Container.hs
@@ -132,3 +132,14 @@ instance LSDiv Matrix Matrix where
     (<\>) = linearSolveSVD
 
 --------------------------------------------------------
+
+-- | Compute mean vector and covariance matrix of the rows of a matrix.
+meanCov :: Matrix Double -> (Vector Double, Matrix Double)
+meanCov x = (med,cov) where
+    r    = rows x
+    k    = 1 / fromIntegral r
+    med  = konst k r `vXm` x
+    meds = konst 1 r `outer` med
+    xc   = x `sub` meds
+    cov  = scale (recip (fromIntegral (r-1))) (trans xc `mXm` xc)
+