containerboot moved to base

9 files changed, 13 insertions, 23 deletions

diff --git a/packages/base/hmatrix-base.cabal b/packages/base/hmatrix-base.cabal
index cf84f30..8571e7a 100644
--- a/packages/base/hmatrix-base.cabal
+++ b/packages/base/hmatrix-base.cabal
@@ -37,6 +37,7 @@ library
                         Data.Packed.Development,
                         Numeric.Conversion
                         Numeric.LinearAlgebra.LAPACK
+                        Data.Packed.Numeric
                         Numeric.Vectorized
                         
     other-modules:      Data.Packed.Internal,
diff --git a/packages/hmatrix/src/Numeric/ContainerBoot.hs b/packages/base/src/Data/Packed/Numeric.hs
index bb65166..4892089 100644
--- a/packages/hmatrix/src/Numeric/ContainerBoot.hs
+++ b/packages/base/src/Data/Packed/Numeric.hs
@@ -7,19 +7,16 @@
 
 -----------------------------------------------------------------------------
 -- |
--- Module      :  Numeric.ContainerBoot
--- Copyright   :  (c) Alberto Ruiz 2010
--- License     :  GPL-style
+-- Module      :  Data.Packed.Numeric
+-- Copyright   :  (c) Alberto Ruiz 2010-14
+-- License     :  BSD3
 --
--- Maintainer  :  Alberto Ruiz <aruiz@um.es>
+-- Maintainer  :  Alberto Ruiz
 -- Stability   :  provisional
--- Portability :  portable
---
--- Module to avoid cyclyc dependencies.
 --
 -----------------------------------------------------------------------------
 
-module Numeric.ContainerBoot (
+module Data.Packed.Numeric (
     -- * Basic functions
     ident, diag, ctrans,
     -- * Generic operations
@@ -43,7 +40,7 @@ import Data.Packed
 import Data.Packed.ST as ST
 import Numeric.Conversion
 import Data.Packed.Development
-import Numeric.GSL.Vector
+import Numeric.Vectorized
 import Data.Complex
 import Control.Applicative((<*>))
 
diff --git a/packages/hmatrix/hmatrix.cabal b/packages/hmatrix/hmatrix.cabal
index 8496663..73edac4 100644
--- a/packages/hmatrix/hmatrix.cabal
+++ b/packages/hmatrix/hmatrix.cabal
@@ -101,7 +101,6 @@ library
     other-modules:      Numeric.Random,
                         Numeric.GSL.Internal,
                         Numeric.GSL.Vector,
-                        Numeric.ContainerBoot,
                         Numeric.IO,
                         Numeric.Chain,
                         Numeric.Vector,
diff --git a/packages/hmatrix/src/Numeric/Chain.hs b/packages/hmatrix/src/Numeric/Chain.hs
index e1ab7da..de6a86f 100644
--- a/packages/hmatrix/src/Numeric/Chain.hs
+++ b/packages/hmatrix/src/Numeric/Chain.hs
@@ -19,7 +19,7 @@ module Numeric.Chain (
 import Data.Maybe
 
 import Data.Packed.Matrix
-import Numeric.ContainerBoot
+import Data.Packed.Numeric
 
 import qualified Data.Array.IArray as A
 
@@ -137,4 +137,4 @@ m1, m2, m3, m4 :: Matrix Double
 m1 = (10><15) [1..]
 m2 = (15><20) [1..]
 m3 = (20><5) [1..]
-m4 = (5><10) [1..]
\ No newline at end of file
+m4 = (5><10) [1..]
diff --git a/packages/hmatrix/src/Numeric/Container.hs b/packages/hmatrix/src/Numeric/Container.hs
index be2347b..645a83f 100644
--- a/packages/hmatrix/src/Numeric/Container.hs
+++ b/packages/hmatrix/src/Numeric/Container.hs
@@ -65,7 +65,7 @@ module Numeric.Container (
 ) where
 
 import Data.Packed hiding (stepD, stepF, condD, condF, conjugateC, conjugateQ)
-import Numeric.ContainerBoot
+import Data.Packed.Numeric
 import Numeric.Chain
 import Numeric.IO
 import Data.Complex
diff --git a/packages/hmatrix/src/Numeric/GSL/Vector.hs b/packages/hmatrix/src/Numeric/GSL/Vector.hs
index e133c2c..bca074f 100644
--- a/packages/hmatrix/src/Numeric/GSL/Vector.hs
+++ b/packages/hmatrix/src/Numeric/GSL/Vector.hs
@@ -11,12 +11,6 @@
 -----------------------------------------------------------------------------
 
 module Numeric.GSL.Vector (
-    sumF, sumR, sumQ, sumC,
-    prodF, prodR, prodQ, prodC,
-    FunCodeS(..), toScalarR, toScalarF, toScalarC, toScalarQ,
-    FunCodeV(..), vectorMapR, vectorMapC, vectorMapF, vectorMapQ,
-    FunCodeSV(..), vectorMapValR, vectorMapValC, vectorMapValF, vectorMapValQ,
-    FunCodeVV(..), vectorZipR, vectorZipC, vectorZipF, vectorZipQ,
     RandDist(..), randomVector,
     saveMatrix,
     fwriteVector, freadVector, fprintfVector, fscanfVector
@@ -24,7 +18,6 @@ module Numeric.GSL.Vector (
 
 import Data.Packed
 import Numeric.GSL.Internal hiding (TV,TM,TCV,TCM)
-import Numeric.Vectorized
 
 import Data.Complex
 import Foreign.Marshal.Alloc(free)
diff --git a/packages/hmatrix/src/Numeric/LinearAlgebra/Algorithms.hs b/packages/hmatrix/src/Numeric/LinearAlgebra/Algorithms.hs
index 0a6eaa1..b4d0c5b 100644
--- a/packages/hmatrix/src/Numeric/LinearAlgebra/Algorithms.hs
+++ b/packages/hmatrix/src/Numeric/LinearAlgebra/Algorithms.hs
@@ -84,7 +84,7 @@ import Data.Packed
 import Numeric.LinearAlgebra.LAPACK as LAPACK
 import Data.List(foldl1')
 import Data.Array
-import Numeric.ContainerBoot
+import Data.Packed.Numeric
 
 
 {- | Generic linear algebra functions for double precision real and complex matrices.
diff --git a/packages/hmatrix/src/Numeric/Random.hs b/packages/hmatrix/src/Numeric/Random.hs
index 936c777..b4c6cde 100644
--- a/packages/hmatrix/src/Numeric/Random.hs
+++ b/packages/hmatrix/src/Numeric/Random.hs
@@ -21,7 +21,7 @@ module Numeric.Random (
 
 import Numeric.GSL.Vector
 import Data.Packed
-import Numeric.ContainerBoot
+import Data.Packed.Numeric
 import Numeric.LinearAlgebra.Algorithms
 
 
diff --git a/packages/hmatrix/src/Numeric/Vector.hs b/packages/hmatrix/src/Numeric/Vector.hs
index 3f480a0..4c59d32 100644
--- a/packages/hmatrix/src/Numeric/Vector.hs
+++ b/packages/hmatrix/src/Numeric/Vector.hs
@@ -20,7 +20,7 @@
 
 module Numeric.Vector () where
 
-import Numeric.GSL.Vector
+import Numeric.Vectorized
 import Numeric.Container
 
 -------------------------------------------------------------------