From 109fa7d25779e331356bbe310755c10eddfeb235 Mon Sep 17 00:00:00 2001 From: Alberto Ruiz Date: Thu, 22 May 2014 20:49:31 +0200 Subject: remove compat --- packages/base/hmatrix.cabal | 2 +- packages/base/src/Numeric/LinearAlgebra/Compat.hs | 25 ---------------------- packages/gsl/src/Numeric/GSL/Random.hs | 4 ++-- .../src/Numeric/LinearAlgebra/Tests/Properties.hs | 3 ++- 4 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 packages/base/src/Numeric/LinearAlgebra/Compat.hs 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 Numeric.LinearAlgebra.Devel Numeric.LinearAlgebra.Data - Numeric.LinearAlgebra.Compat + -- Numeric.LinearAlgebra.Compat 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 @@ ------------------------------------------------------------------------------ -{- | -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/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 -> Matrix Double -- ^ result gaussianSample seed n med cov = m where c = dim med - meds = konst' 1 n `outer` med + meds = konst 1 n `outer` med rs = reshape c $ randomVector seed Gaussian (c * n) m = rs `mXm` cholSH cov `add` meds @@ -57,7 +57,7 @@ uniformSample seed n rgs = m where cs = zipWith subtract as bs d = dim a dat = toRows $ reshape n $ randomVector seed Uniform (n*d) - am = konst' 1 n `outer` a + am = konst 1 n `outer` a m = fromColumns (zipWith scale cs dat) `add` am -- | 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 ( linearSolveProp, linearSolveProp2 ) where -import Numeric.LinearAlgebra.Compat hiding (Testable) --hiding (real,complex) +import Numeric.Container hiding (Testable) +import Numeric.LinearAlgebra --hiding (real,complex) import Numeric.LinearAlgebra.LAPACK import Debug.Trace import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector -- cgit v1.2.3