Numeric.Container and Numeric.LinearAlgebra moved to base

6 files changed, 5 insertions, 146 deletions

diff --git a/packages/base/src/Numeric/LinearAlgebra/Base.hs b/packages/base/src/Numeric/LinearAlgebra/Base.hs
deleted file mode 100644
index 8d44d26..0000000
--- a/packages/base/src/Numeric/LinearAlgebra/Base.hs
+++ /dev/null
@@ -1,141 +0,0 @@
------------------------------------------------------------------------------
-{- |
-Module      :  Numeric.LinearAlgebra
-Copyright   :  (c) Alberto Ruiz 2006-14
-License     :  BSD3
-Maintainer  :  Alberto Ruiz
-Stability   :  provisional
-
--}
------------------------------------------------------------------------------
-module Numeric.LinearAlgebra.Base (
-
-    -- * Basic types and data processing    
-    module Numeric.LinearAlgebra.Data,
-    
-    -- | The standard numeric classes are defined elementwise:
-    --
-    -- >>> fromList [1,2,3] * fromList [3,0,-2 :: Double]
-    -- fromList [3.0,0.0,-6.0]
-    -- 
-    -- >>> (3><3) [1..9] * ident 3 :: Matrix Double
-    -- (3><3)
-    --  [ 1.0, 0.0, 0.0
-    --  , 0.0, 5.0, 0.0
-    --  , 0.0, 0.0, 9.0 ]
-    --
-    -- In arithmetic operations single-element vectors and matrices
-    -- (created from numeric literals or using 'scalar') automatically
-    -- expand to match the dimensions of the other operand:
-    -- 
-    -- >>> 5 + 2*ident 3 :: Matrix Double
-    -- (3><3)
-    --  [ 7.0, 5.0, 5.0
-    --  , 5.0, 7.0, 5.0
-    --  , 5.0, 5.0, 7.0 ]
-    --
-
-    -- * Matrix product
-    (<.>),
-    
-    -- | This operator can also be written using the unicode symbol ◇ (25c7).
-    --
-    
-    -- | The matrix x matrix product is also implemented in the "Data.Monoid" instance, where
-    -- single-element matrices (created from numeric literals or using 'scalar')
-    -- are used for scaling.
-    --
-    -- >>> let m = (2><3)[1..] :: Matrix Double
-    -- >>> m <> 2 <> diagl[0.5,1,0]
-    -- (2><3)
-    -- [ 1.0,  4.0, 0.0
-    -- , 4.0, 10.0, 0.0 ]
-    --
-    -- 'mconcat' uses 'optimiseMult' to get the optimal association order.
-     
-    -- * Other products
-    outer, kronecker, cross,
-    scale,
-    sumElements, prodElements, absSum,
-    
-    -- * Linear Systems
-    (<\>),
-    linearSolve,
-    linearSolveLS,
-    linearSolveSVD,
-    luSolve,
-    cholSolve,
-    
-    -- * Inverse and pseudoinverse
-    inv, pinv, pinvTol,
-
-    -- * Determinant and rank
-    rcond, rank, ranksv, 
-    det, invlndet,
-    
-    -- * Singular value decomposition
-    svd,
-    fullSVD,
-    thinSVD,
-    compactSVD,
-    singularValues,
-    leftSV, rightSV,
-    
-    -- * Eigensystems
-    eig, eigSH, eigSH',
-    eigenvalues, eigenvaluesSH, eigenvaluesSH',
-    geigSH',
-
-    -- * QR
-    qr, rq, qrRaw, qrgr,
-
-    -- * Cholesky
-    chol, cholSH, mbCholSH,
-
-    -- * Hessenberg
-    hess,
-
-    -- * Schur
-    schur,
-
-    -- * LU
-    lu, luPacked,
-    
-    -- * Matrix functions
-    expm,
-    sqrtm,
-    matFunc,
-
-    -- * Nullspace
-    nullspacePrec,
-    nullVector,
-    nullspaceSVD,
-    null1, null1sym,
-    
-    orth,
-
-    -- * Norms
-    norm1, norm2, normInf, pnorm, NormType(..),
-
-    -- * Correlation and convolution
-    corr, conv, corrMin, corr2, conv2,
-
-    -- * Random arrays
-
-    RandDist(..), randomVector, rand, randn, gaussianSample, uniformSample,
-    
-    -- * Misc
-    meanCov, peps, relativeError, haussholder, optimiseMult, udot, Seed, (◇)
-) where
-
-import Numeric.LinearAlgebra.Data
-
-import Numeric.Matrix()
-import Numeric.Vector()
-import Data.Packed.Numeric
-import Numeric.LinearAlgebra.Algorithms
-import Numeric.LinearAlgebra.Util
-import Numeric.LinearAlgebra.Random
-
-
-
diff --git a/packages/base/src/Numeric/LinearAlgebra/Data.hs b/packages/base/src/Numeric/LinearAlgebra/Data.hs
index 45fc00c..7e8af03 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Data.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Data.hs
@@ -62,7 +62,7 @@ module Numeric.LinearAlgebra.Data(
 
 import Data.Packed.Vector
 import Data.Packed.Matrix
-import Data.Packed.Numeric
+import Numeric.Container
 import Numeric.LinearAlgebra.Util
 import Data.Complex
 
diff --git a/packages/base/src/Numeric/LinearAlgebra/Devel.hs b/packages/base/src/Numeric/LinearAlgebra/Devel.hs
index b5ef60d..c41db2d 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Devel.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Devel.hs
@@ -60,7 +60,7 @@ module Numeric.LinearAlgebra.Devel(
 import Data.Packed.Foreign
 import Data.Packed.Development
 import Data.Packed.ST
-import Data.Packed.Numeric(Container,Contraction,LSDiv,Product,
+import Numeric.Container(Container,Contraction,LSDiv,Product,
                          Complexable(),RealElement(),
                          RealOf, ComplexOf, SingleOf, DoubleOf, IndexOf)
 import Data.Packed
diff --git a/packages/base/src/Numeric/LinearAlgebra/Random.hs b/packages/base/src/Numeric/LinearAlgebra/Random.hs
index b36c7a3..7afd658 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Random.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Random.hs
@@ -20,7 +20,7 @@ module Numeric.LinearAlgebra.Random (
 ) where
 
 import Numeric.Vectorized
-import Data.Packed.Numeric
+import Numeric.Container
 import Numeric.LinearAlgebra.Algorithms
 import System.Random(randomIO)
 
diff --git a/packages/base/src/Numeric/LinearAlgebra/Util.hs b/packages/base/src/Numeric/LinearAlgebra/Util.hs
index 440f6d1..2f91e18 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Util.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Util.hs
@@ -48,7 +48,7 @@ module Numeric.LinearAlgebra.Util(
     vtrans
 ) where
 
-import Data.Packed.Numeric
+import Numeric.Container
 import Numeric.LinearAlgebra.Algorithms hiding (i)
 import Numeric.Matrix()
 import Numeric.Vector()
diff --git a/packages/base/src/Numeric/LinearAlgebra/Util/Convolution.hs b/packages/base/src/Numeric/LinearAlgebra/Util/Convolution.hs
index 1d4e089..e4cba8f 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Util/Convolution.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Util/Convolution.hs
@@ -16,7 +16,7 @@ module Numeric.LinearAlgebra.Util.Convolution(
    corr2, conv2, separable
 ) where
 
-import Data.Packed.Numeric
+import Numeric.Container
 
 
 vectSS :: Element t => Int -> Vector t -> Matrix t