From 35a7f3355611cd20994f36b43acbd7413e09f558 Mon Sep 17 00:00:00 2001 From: Alberto Ruiz Date: Thu, 29 Oct 2015 12:57:43 +0100 Subject: bump versions, fix tests, thanks --- packages/tests/hmatrix-tests.cabal | 6 +++--- packages/tests/src/Numeric/LinearAlgebra/Tests.hs | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'packages/tests') 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)] -- cgit v1.2.3