bump versions, fix tests, thanks

6 files changed, 14 insertions, 10 deletions

diff --git a/packages/base/THANKS.md b/packages/base/THANKS.md
index f331dea..55a428c 100644
--- a/packages/base/THANKS.md
+++ b/packages/base/THANKS.md
@@ -205,3 +205,5 @@ module reorganization, monadic mapVectorM, and many other improvements.
 - Vassil Keremidchiev fixed the cabal options for OpenBlas, fixed several installation
   issues, and added support for stack-based build.
 
+- Patrik Jansson changed meanCov and gaussianSample to use Herm type. Fixed stack.yaml.
+
diff --git a/packages/base/hmatrix.cabal b/packages/base/hmatrix.cabal
index 0cfbd88..9fa3c4e 100644
--- a/packages/base/hmatrix.cabal
+++ b/packages/base/hmatrix.cabal
@@ -1,5 +1,5 @@
 Name:               hmatrix
-Version:            0.17.0.2
+Version:            0.18.0.0
 License:            BSD3
 License-file:       LICENSE
 Author:             Alberto Ruiz
diff --git a/packages/base/src/Internal/Random.hs b/packages/base/src/Internal/Random.hs
index 8c792eb..60b2cef 100644
--- a/packages/base/src/Internal/Random.hs
+++ b/packages/base/src/Internal/Random.hs
@@ -31,13 +31,13 @@ import System.Random(randomIO)
 gaussianSample :: Seed
                -> Int -- ^ number of rows
                -> Vector Double -- ^ mean vector
-               -> Matrix Double -- ^ covariance matrix
+               -> Herm Double   -- ^ covariance matrix
                -> Matrix Double -- ^ result
 gaussianSample seed n med cov = m where
     c = dim med
     meds = konst' 1 n `outer` med
     rs = reshape c $ randomVector seed Gaussian (c * n)
-    m = rs `mXm` cholSH cov `add` meds
+    m = rs `mXm` chol cov `add` meds
 
 -- | Obtains a matrix whose rows are pseudorandom samples from a multivariate
 -- uniform distribution.
diff --git a/packages/gsl/hmatrix-gsl.cabal b/packages/gsl/hmatrix-gsl.cabal
index f288c64..d009994 100644
--- a/packages/gsl/hmatrix-gsl.cabal
+++ b/packages/gsl/hmatrix-gsl.cabal
@@ -1,5 +1,5 @@
 Name:               hmatrix-gsl
-Version:            0.17.0.0
+Version:            0.18.0.0
 License:            GPL
 License-file:       LICENSE
 Author:             Alberto Ruiz
@@ -25,7 +25,7 @@ flag onlygsl
 
 library
 
-    Build-Depends:      base<5, hmatrix>=0.17, array, vector,
+    Build-Depends:      base<5, hmatrix>=0.18, array, vector,
                         process, random
 
 
diff --git a/packages/tests/hmatrix-tests.cabal b/packages/tests/hmatrix-tests.cabal
index 49e0640..d4c87aa 100644
--- a/packages/tests/hmatrix-tests.cabal
+++ b/packages/tests/hmatrix-tests.cabal
@@ -1,5 +1,5 @@
 Name:               hmatrix-tests
-Version:            0.5.0.0
+Version:            0.6.0.0
 License:            BSD3
 License-file:       LICENSE
 Author:             Alberto Ruiz
@@ -28,9 +28,9 @@ library
 
     Build-Depends:      base >= 4 && < 5, deepseq,
                         QuickCheck >= 2, HUnit, random,
-                        hmatrix >= 0.17
+                        hmatrix >= 0.18
     if flag(gsl)
-      Build-Depends:    hmatrix-gsl >= 0.17
+      Build-Depends:    hmatrix-gsl >= 0.18
 
     hs-source-dirs:     src
 
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
index 56546b6..d9cc3b6 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
@@ -132,7 +132,8 @@ mbCholTest = utest "mbCholTest" (ok1 && ok2) where
 
 ---------------------------------------------------------------------
 
-randomTestGaussian = c :~1~: snd (meanCov dat) where
+randomTestGaussian = (unSym c) :~3~: unSym (snd (meanCov dat))
+  where
     a = (3><3) [1,2,3,
                 2,4,0,
                -2,2,1]
@@ -140,7 +141,8 @@ randomTestGaussian = c :~1~: snd (meanCov dat) where
     c = mTm a
     dat = gaussianSample 7 (10^6) m c
 
-randomTestUniform = c :~1~: snd (meanCov dat) where
+randomTestUniform = c :~2~: unSym (snd (meanCov dat))
+  where
     c = diag $ 3 |> map ((/12).(^2)) [1,2,3]
     dat = uniformSample 7 (10^6) [(0,1),(1,3),(3,6)]