summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorAlberto Ruiz <aruiz@um.es>2014-05-15 20:30:57 +0200
committerAlberto Ruiz <aruiz@um.es>2014-05-15 20:30:57 +0200
commita86c60a5fbfc73ff3080c88007625c2cd094e80f (patch)
treee2aa5c50ee23eeb35173ac1ffcd43a51fb860003 /packages
parent69d1fc1588532b48a946c1501f92ed56600baf4d (diff)
containerboot moved to base
Diffstat (limited to 'packages')
-rw-r--r--packages/base/hmatrix-base.cabal1
-rw-r--r--packages/base/src/Data/Packed/Numeric.hs (renamed from packages/hmatrix/src/Numeric/ContainerBoot.hs)15
-rw-r--r--packages/hmatrix/hmatrix.cabal1
-rw-r--r--packages/hmatrix/src/Numeric/Chain.hs4
-rw-r--r--packages/hmatrix/src/Numeric/Container.hs2
-rw-r--r--packages/hmatrix/src/Numeric/GSL/Vector.hs7
-rw-r--r--packages/hmatrix/src/Numeric/LinearAlgebra/Algorithms.hs2
-rw-r--r--packages/hmatrix/src/Numeric/Random.hs2
-rw-r--r--packages/hmatrix/src/Numeric/Vector.hs2
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
37 Data.Packed.Development, 37 Data.Packed.Development,
38 Numeric.Conversion 38 Numeric.Conversion
39 Numeric.LinearAlgebra.LAPACK 39 Numeric.LinearAlgebra.LAPACK
40 Data.Packed.Numeric
40 Numeric.Vectorized 41 Numeric.Vectorized
41 42
42 other-modules: Data.Packed.Internal, 43 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 @@
7 7
8----------------------------------------------------------------------------- 8-----------------------------------------------------------------------------
9-- | 9-- |
10-- Module : Numeric.ContainerBoot 10-- Module : Data.Packed.Numeric
11-- Copyright : (c) Alberto Ruiz 2010 11-- Copyright : (c) Alberto Ruiz 2010-14
12-- License : GPL-style 12-- License : BSD3
13-- 13--
14-- Maintainer : Alberto Ruiz <aruiz@um.es> 14-- Maintainer : Alberto Ruiz
15-- Stability : provisional 15-- Stability : provisional
16-- Portability : portable
17--
18-- Module to avoid cyclyc dependencies.
19-- 16--
20----------------------------------------------------------------------------- 17-----------------------------------------------------------------------------
21 18
22module Numeric.ContainerBoot ( 19module Data.Packed.Numeric (
23 -- * Basic functions 20 -- * Basic functions
24 ident, diag, ctrans, 21 ident, diag, ctrans,
25 -- * Generic operations 22 -- * Generic operations
@@ -43,7 +40,7 @@ import Data.Packed
43import Data.Packed.ST as ST 40import Data.Packed.ST as ST
44import Numeric.Conversion 41import Numeric.Conversion
45import Data.Packed.Development 42import Data.Packed.Development
46import Numeric.GSL.Vector 43import Numeric.Vectorized
47import Data.Complex 44import Data.Complex
48import Control.Applicative((<*>)) 45import Control.Applicative((<*>))
49 46
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
101 other-modules: Numeric.Random, 101 other-modules: Numeric.Random,
102 Numeric.GSL.Internal, 102 Numeric.GSL.Internal,
103 Numeric.GSL.Vector, 103 Numeric.GSL.Vector,
104 Numeric.ContainerBoot,
105 Numeric.IO, 104 Numeric.IO,
106 Numeric.Chain, 105 Numeric.Chain,
107 Numeric.Vector, 106 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 (
19import Data.Maybe 19import Data.Maybe
20 20
21import Data.Packed.Matrix 21import Data.Packed.Matrix
22import Numeric.ContainerBoot 22import Data.Packed.Numeric
23 23
24import qualified Data.Array.IArray as A 24import qualified Data.Array.IArray as A
25 25
@@ -137,4 +137,4 @@ m1, m2, m3, m4 :: Matrix Double
137m1 = (10><15) [1..] 137m1 = (10><15) [1..]
138m2 = (15><20) [1..] 138m2 = (15><20) [1..]
139m3 = (20><5) [1..] 139m3 = (20><5) [1..]
140m4 = (5><10) [1..] \ No newline at end of file 140m4 = (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 (
65) where 65) where
66 66
67import Data.Packed hiding (stepD, stepF, condD, condF, conjugateC, conjugateQ) 67import Data.Packed hiding (stepD, stepF, condD, condF, conjugateC, conjugateQ)
68import Numeric.ContainerBoot 68import Data.Packed.Numeric
69import Numeric.Chain 69import Numeric.Chain
70import Numeric.IO 70import Numeric.IO
71import Data.Complex 71import 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 @@
11----------------------------------------------------------------------------- 11-----------------------------------------------------------------------------
12 12
13module Numeric.GSL.Vector ( 13module Numeric.GSL.Vector (
14 sumF, sumR, sumQ, sumC,
15 prodF, prodR, prodQ, prodC,
16 FunCodeS(..), toScalarR, toScalarF, toScalarC, toScalarQ,
17 FunCodeV(..), vectorMapR, vectorMapC, vectorMapF, vectorMapQ,
18 FunCodeSV(..), vectorMapValR, vectorMapValC, vectorMapValF, vectorMapValQ,
19 FunCodeVV(..), vectorZipR, vectorZipC, vectorZipF, vectorZipQ,
20 RandDist(..), randomVector, 14 RandDist(..), randomVector,
21 saveMatrix, 15 saveMatrix,
22 fwriteVector, freadVector, fprintfVector, fscanfVector 16 fwriteVector, freadVector, fprintfVector, fscanfVector
@@ -24,7 +18,6 @@ module Numeric.GSL.Vector (
24 18
25import Data.Packed 19import Data.Packed
26import Numeric.GSL.Internal hiding (TV,TM,TCV,TCM) 20import Numeric.GSL.Internal hiding (TV,TM,TCV,TCM)
27import Numeric.Vectorized
28 21
29import Data.Complex 22import Data.Complex
30import Foreign.Marshal.Alloc(free) 23import 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
84import Numeric.LinearAlgebra.LAPACK as LAPACK 84import Numeric.LinearAlgebra.LAPACK as LAPACK
85import Data.List(foldl1') 85import Data.List(foldl1')
86import Data.Array 86import Data.Array
87import Numeric.ContainerBoot 87import Data.Packed.Numeric
88 88
89 89
90{- | Generic linear algebra functions for double precision real and complex matrices. 90{- | 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 (
21 21
22import Numeric.GSL.Vector 22import Numeric.GSL.Vector
23import Data.Packed 23import Data.Packed
24import Numeric.ContainerBoot 24import Data.Packed.Numeric
25import Numeric.LinearAlgebra.Algorithms 25import Numeric.LinearAlgebra.Algorithms
26 26
27 27
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 @@
20 20
21module Numeric.Vector () where 21module Numeric.Vector () where
22 22
23import Numeric.GSL.Vector 23import Numeric.Vectorized
24import Numeric.Container 24import Numeric.Container
25 25
26------------------------------------------------------------------- 26-------------------------------------------------------------------