summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/base/hmatrix.cabal2
-rw-r--r--packages/base/src/Numeric/LinearAlgebra/Compat.hs25
-rw-r--r--packages/gsl/src/Numeric/GSL/Random.hs4
-rw-r--r--packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs3
4 files changed, 5 insertions, 29 deletions
diff --git a/packages/base/hmatrix.cabal b/packages/base/hmatrix.cabal
index 8f6b04b..a92409b 100644
--- a/packages/base/hmatrix.cabal
+++ b/packages/base/hmatrix.cabal
@@ -47,7 +47,7 @@ library
47 Numeric.LinearAlgebra.Devel 47 Numeric.LinearAlgebra.Devel
48 Numeric.LinearAlgebra.Data 48 Numeric.LinearAlgebra.Data
49 49
50 Numeric.LinearAlgebra.Compat 50 -- Numeric.LinearAlgebra.Compat
51 51
52 52
53 other-modules: Data.Packed.Internal, 53 other-modules: Data.Packed.Internal,
diff --git a/packages/base/src/Numeric/LinearAlgebra/Compat.hs b/packages/base/src/Numeric/LinearAlgebra/Compat.hs
deleted file mode 100644
index 7b43365..0000000
--- a/packages/base/src/Numeric/LinearAlgebra/Compat.hs
+++ /dev/null
@@ -1,25 +0,0 @@
1-----------------------------------------------------------------------------
2{- |
3Module : Numeric.LinearAlgebra.Compat
4Copyright : (c) Alberto Ruiz 2006-14
5License : BSD3
6Maintainer : Alberto Ruiz
7Stability : provisional
8
9-}
10-----------------------------------------------------------------------------
11{-# OPTIONS_HADDOCK hide #-}
12
13module Numeric.LinearAlgebra.Compat (
14 module Numeric.Container,
15 module Numeric.LinearAlgebra.Algorithms,
16 meanCov
17) where
18
19import Numeric.Container
20import Numeric.LinearAlgebra.Algorithms
21import Numeric.Matrix()
22import Numeric.Vector()
23import Numeric.LinearAlgebra.Util(meanCov)
24
25
diff --git a/packages/gsl/src/Numeric/GSL/Random.hs b/packages/gsl/src/Numeric/GSL/Random.hs
index 2594d27..07fa64d 100644
--- a/packages/gsl/src/Numeric/GSL/Random.hs
+++ b/packages/gsl/src/Numeric/GSL/Random.hs
@@ -41,7 +41,7 @@ gaussianSample :: Seed
41 -> Matrix Double -- ^ result 41 -> Matrix Double -- ^ result
42gaussianSample seed n med cov = m where 42gaussianSample seed n med cov = m where
43 c = dim med 43 c = dim med
44 meds = konst' 1 n `outer` med 44 meds = konst 1 n `outer` med
45 rs = reshape c $ randomVector seed Gaussian (c * n) 45 rs = reshape c $ randomVector seed Gaussian (c * n)
46 m = rs `mXm` cholSH cov `add` meds 46 m = rs `mXm` cholSH cov `add` meds
47 47
@@ -57,7 +57,7 @@ uniformSample seed n rgs = m where
57 cs = zipWith subtract as bs 57 cs = zipWith subtract as bs
58 d = dim a 58 d = dim a
59 dat = toRows $ reshape n $ randomVector seed Uniform (n*d) 59 dat = toRows $ reshape n $ randomVector seed Uniform (n*d)
60 am = konst' 1 n `outer` a 60 am = konst 1 n `outer` a
61 m = fromColumns (zipWith scale cs dat) `add` am 61 m = fromColumns (zipWith scale cs dat) `add` am
62 62
63-- | pseudorandom matrix with uniform elements between 0 and 1 63-- | pseudorandom matrix with uniform elements between 0 and 1
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs
index 110ed24..657689a 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs
@@ -43,7 +43,8 @@ module Numeric.LinearAlgebra.Tests.Properties (
43 linearSolveProp, linearSolveProp2 43 linearSolveProp, linearSolveProp2
44) where 44) where
45 45
46import Numeric.LinearAlgebra.Compat hiding (Testable) --hiding (real,complex) 46import Numeric.Container hiding (Testable)
47import Numeric.LinearAlgebra --hiding (real,complex)
47import Numeric.LinearAlgebra.LAPACK 48import Numeric.LinearAlgebra.LAPACK
48import Debug.Trace 49import Debug.Trace
49import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector 50import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector