55 files changed, 16 insertions, 33 deletions
diff --git a/packages/hmatrix/examples/bool.hs b/examples/bool.hs
index 679b8bf..679b8bf 100644
--- a/packages/hmatrix/examples/bool.hs
+++ b/examples/bool.hs
diff --git a/packages/hmatrix/examples/data.txt b/examples/data.txt
index 2b9bfea..2b9bfea 100644
--- a/packages/hmatrix/examples/data.txt
+++ b/examples/data.txt
diff --git a/packages/hmatrix/examples/deriv.hs b/examples/deriv.hs
index c9456d1..c9456d1 100644
--- a/packages/hmatrix/examples/deriv.hs
+++ b/examples/deriv.hs
diff --git a/packages/hmatrix/examples/devel/ej1/functions.c b/examples/devel/ej1/functions.c
index 02a4cdd..02a4cdd 100644
--- a/packages/hmatrix/examples/devel/ej1/functions.c
+++ b/examples/devel/ej1/functions.c
diff --git a/packages/hmatrix/examples/devel/ej1/wrappers.hs b/examples/devel/ej1/wrappers.hs
index a88f74b..a88f74b 100644
--- a/packages/hmatrix/examples/devel/ej1/wrappers.hs
+++ b/examples/devel/ej1/wrappers.hs
diff --git a/packages/hmatrix/examples/devel/ej2/functions.c b/examples/devel/ej2/functions.c
index 4dcd377..4dcd377 100644
--- a/packages/hmatrix/examples/devel/ej2/functions.c
+++ b/examples/devel/ej2/functions.c
diff --git a/packages/hmatrix/examples/devel/ej2/wrappers.hs b/examples/devel/ej2/wrappers.hs
index 1c02a24..1c02a24 100644
--- a/packages/hmatrix/examples/devel/ej2/wrappers.hs
+++ b/examples/devel/ej2/wrappers.hs
diff --git a/packages/hmatrix/examples/error.hs b/examples/error.hs
index 5efae7c..5efae7c 100644
--- a/packages/hmatrix/examples/error.hs
+++ b/examples/error.hs
diff --git a/packages/hmatrix/examples/fitting.hs b/examples/fitting.hs
index a8f6b1c..a8f6b1c 100644
--- a/packages/hmatrix/examples/fitting.hs
+++ b/examples/fitting.hs
diff --git a/packages/hmatrix/examples/inplace.hs b/examples/inplace.hs
index dcfff56..dcfff56 100644
--- a/packages/hmatrix/examples/inplace.hs
+++ b/examples/inplace.hs
diff --git a/packages/hmatrix/examples/integrate.hs b/examples/integrate.hs
index 3a03da6..3a03da6 100644
--- a/packages/hmatrix/examples/integrate.hs
+++ b/examples/integrate.hs
diff --git a/packages/hmatrix/examples/kalman.hs b/examples/kalman.hs
index 7fbe3d2..7fbe3d2 100644
--- a/packages/hmatrix/examples/kalman.hs
+++ b/examples/kalman.hs
diff --git a/packages/hmatrix/examples/lie.hs b/examples/lie.hs
index db21ea8..db21ea8 100644
--- a/packages/hmatrix/examples/lie.hs
+++ b/examples/lie.hs
diff --git a/packages/hmatrix/examples/minimize.hs b/examples/minimize.hs
index 19b2cb3..19b2cb3 100644
--- a/packages/hmatrix/examples/minimize.hs
+++ b/examples/minimize.hs
diff --git a/packages/hmatrix/examples/monadic.hs b/examples/monadic.hs
index 7c6e0f4..7c6e0f4 100644
--- a/packages/hmatrix/examples/monadic.hs
+++ b/examples/monadic.hs
diff --git a/packages/hmatrix/examples/multiply.hs b/examples/multiply.hs
index 572961c..572961c 100644
--- a/packages/hmatrix/examples/multiply.hs
+++ b/examples/multiply.hs
diff --git a/packages/hmatrix/examples/ode.hs b/examples/ode.hs
index dc6e0ec..dc6e0ec 100644
--- a/packages/hmatrix/examples/ode.hs
+++ b/examples/ode.hs
diff --git a/packages/hmatrix/examples/parallel.hs b/examples/parallel.hs
index e875407..e875407 100644
--- a/packages/hmatrix/examples/parallel.hs
+++ b/examples/parallel.hs
diff --git a/packages/hmatrix/examples/pca1.hs b/examples/pca1.hs
index a11eba9..a11eba9 100644
--- a/packages/hmatrix/examples/pca1.hs
+++ b/examples/pca1.hs
diff --git a/packages/hmatrix/examples/pca2.hs b/examples/pca2.hs
index e7ea95f..e7ea95f 100644
--- a/packages/hmatrix/examples/pca2.hs
+++ b/examples/pca2.hs
diff --git a/packages/hmatrix/examples/pinv.hs b/examples/pinv.hs
index 7de50b8..7de50b8 100644
--- a/packages/hmatrix/examples/pinv.hs
+++ b/examples/pinv.hs
diff --git a/packages/hmatrix/examples/plot.hs b/examples/plot.hs
index f950aa5..f950aa5 100644
--- a/packages/hmatrix/examples/plot.hs
+++ b/examples/plot.hs
diff --git a/packages/hmatrix/examples/root.hs b/examples/root.hs
index 8546ff5..8546ff5 100644
--- a/packages/hmatrix/examples/root.hs
+++ b/examples/root.hs
diff --git a/packages/hmatrix/examples/vector.hs b/examples/vector.hs
index f531cbd..f531cbd 100644
--- a/packages/hmatrix/examples/vector.hs
+++ b/examples/vector.hs
diff --git a/packages/Makefile b/packages/Makefile
index c8bedb8..648c726 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -1,4 +1,4 @@
-pkgs=base hmatrix special glpk tests ../../hTensor
+pkgs=base gsl special glpk tests ../../hTensor
 all:
        for p in $(pkgs); do \
diff --git a/packages/hmatrix/CHANGELOG b/packages/base/CHANGELOG
index 99a6845..99a6845 100644
--- a/packages/hmatrix/CHANGELOG
+++ b/packages/base/CHANGELOG
diff --git a/packages/hmatrix/INSTALL.md b/packages/base/INSTALL.md
index ef51167..ef51167 100644
--- a/packages/hmatrix/INSTALL.md
+++ b/packages/base/INSTALL.md
diff --git a/packages/hmatrix/THANKS.md b/packages/base/THANKS.md
index b1417a6..b1417a6 100644
--- a/packages/hmatrix/THANKS.md
+++ b/packages/base/THANKS.md
diff --git a/packages/base/hmatrix-base.cabal b/packages/base/hmatrix.cabal
index 91dc0db..5f3c48e 100644
--- a/packages/base/hmatrix-base.cabal
+++ b/packages/base/hmatrix.cabal
@@ -15,6 +15,8 @@ cabal-version:      >=1.8
 build-type:         Simple
+extra-source-files: THANKS.md INSTALL.md CHANGELOG
 extra-source-files: src/C/lapack-aux.h
 library
diff --git a/packages/glpk/hmatrix-glpk.cabal b/packages/glpk/hmatrix-glpk.cabal
index 96f53eb..5f3b34e 100644
--- a/packages/glpk/hmatrix-glpk.cabal
+++ b/packages/glpk/hmatrix-glpk.cabal
@@ -22,7 +22,7 @@ extra-source-files:     examples/simplex1.hs
                        examples/simplex4.hs
 library
-    Build-Depends:      base, hmatrix-base
+    Build-Depends:      base, hmatrix
    hs-source-dirs:     lib
diff --git a/packages/hmatrix/LICENSE b/packages/gsl/LICENSE
index 3f67c2a..3f67c2a 100644
--- a/packages/hmatrix/LICENSE
+++ b/packages/gsl/LICENSE
diff --git a/packages/hmatrix/Setup.lhs b/packages/gsl/Setup.lhs
index 4b19c19..4b19c19 100644
--- a/packages/hmatrix/Setup.lhs
+++ b/packages/gsl/Setup.lhs
diff --git a/packages/hmatrix/hmatrix.cabal b/packages/gsl/hmatrix-gsl.cabal
index 83a2188..bfc25b1 100644
--- a/packages/hmatrix/hmatrix.cabal
+++ b/packages/gsl/hmatrix-gsl.cabal
@@ -18,33 +18,6 @@ cabal-version:      >=1.8
 build-type:         Simple
-extra-source-files: THANKS.md INSTALL.md CHANGELOG
-extra-source-files: examples/deriv.hs
-                    examples/integrate.hs
-                    examples/minimize.hs
-                    examples/root.hs
-                    examples/ode.hs
-                    examples/pca1.hs
-                    examples/pca2.hs
-                    examples/pinv.hs
-                    examples/data.txt
-                    examples/lie.hs
-                    examples/kalman.hs
-                    examples/parallel.hs
-                    examples/plot.hs
-                    examples/inplace.hs
-                    examples/error.hs
-                    examples/fitting.hs
-                    examples/devel/ej1/wrappers.hs
-                    examples/devel/ej1/functions.c
-                    examples/devel/ej2/wrappers.hs
-                    examples/devel/ej2/functions.c
-                    examples/vector.hs
-                    examples/monadic.hs
-                    examples/bool.hs
-                    examples/multiply.hs
 extra-source-files: src/Numeric/GSL/gsl-ode.c
 flag dd
diff --git a/packages/hmatrix/src/Graphics/Plot.hs b/packages/gsl/src/Graphics/Plot.hs
index 0ea41ac..0ea41ac 100644
--- a/packages/hmatrix/src/Graphics/Plot.hs
+++ b/packages/gsl/src/Graphics/Plot.hs
diff --git a/packages/hmatrix/src/Numeric/GSL.hs b/packages/gsl/src/Numeric/GSL.hs
index 61b8d7b..61b8d7b 100644
--- a/packages/hmatrix/src/Numeric/GSL.hs
+++ b/packages/gsl/src/Numeric/GSL.hs
diff --git a/packages/hmatrix/src/Numeric/GSL/Differentiation.hs b/packages/gsl/src/Numeric/GSL/Differentiation.hs
index 0fb58ef..0fb58ef 100644
--- a/packages/hmatrix/src/Numeric/GSL/Differentiation.hs
+++ b/packages/gsl/src/Numeric/GSL/Differentiation.hs
diff --git a/packages/hmatrix/src/Numeric/GSL/Fitting.hs b/packages/gsl/src/Numeric/GSL/Fitting.hs
index 93fb281..93fb281 100644
--- a/packages/hmatrix/src/Numeric/GSL/Fitting.hs
+++ b/packages/gsl/src/Numeric/GSL/Fitting.hs
diff --git a/packages/hmatrix/src/Numeric/GSL/Fourier.hs b/packages/gsl/src/Numeric/GSL/Fourier.hs
index 734325b..734325b 100644
--- a/packages/hmatrix/src/Numeric/GSL/Fourier.hs
+++ b/packages/gsl/src/Numeric/GSL/Fourier.hs
diff --git a/packages/hmatrix/src/Numeric/GSL/IO.hs b/packages/gsl/src/Numeric/GSL/IO.hs
index 0d6031a..0d6031a 100644
--- a/packages/hmatrix/src/Numeric/GSL/IO.hs
+++ b/packages/gsl/src/Numeric/GSL/IO.hs
diff --git a/packages/hmatrix/src/Numeric/GSL/Integration.hs b/packages/gsl/src/Numeric/GSL/Integration.hs
index 9c1d43a..9c1d43a 100644
--- a/packages/hmatrix/src/Numeric/GSL/Integration.hs
+++ b/packages/gsl/src/Numeric/GSL/Integration.hs
diff --git a/packages/hmatrix/src/Numeric/GSL/Internal.hs b/packages/gsl/src/Numeric/GSL/Internal.hs
index a1c4e0c..a1c4e0c 100644
--- a/packages/hmatrix/src/Numeric/GSL/Internal.hs
+++ b/packages/gsl/src/Numeric/GSL/Internal.hs
diff --git a/packages/hmatrix/src/Numeric/GSL/LinearAlgebra.hs b/packages/gsl/src/Numeric/GSL/LinearAlgebra.hs
index 17e2258..17e2258 100644
--- a/packages/hmatrix/src/Numeric/GSL/LinearAlgebra.hs
+++ b/packages/gsl/src/Numeric/GSL/LinearAlgebra.hs
diff --git a/packages/hmatrix/src/Numeric/GSL/Minimization.hs b/packages/gsl/src/Numeric/GSL/Minimization.hs
index 056d463..056d463 100644
--- a/packages/hmatrix/src/Numeric/GSL/Minimization.hs
+++ b/packages/gsl/src/Numeric/GSL/Minimization.hs
diff --git a/packages/hmatrix/src/Numeric/GSL/ODE.hs b/packages/gsl/src/Numeric/GSL/ODE.hs
index 7549a65..7549a65 100644
--- a/packages/hmatrix/src/Numeric/GSL/ODE.hs
+++ b/packages/gsl/src/Numeric/GSL/ODE.hs
diff --git a/packages/hmatrix/src/Numeric/GSL/Polynomials.hs b/packages/gsl/src/Numeric/GSL/Polynomials.hs
index b1be85d..b1be85d 100644
--- a/packages/hmatrix/src/Numeric/GSL/Polynomials.hs
+++ b/packages/gsl/src/Numeric/GSL/Polynomials.hs
diff --git a/packages/hmatrix/src/Numeric/GSL/Random.hs b/packages/gsl/src/Numeric/GSL/Random.hs
index 2872b17..2872b17 100644
--- a/packages/hmatrix/src/Numeric/GSL/Random.hs
+++ b/packages/gsl/src/Numeric/GSL/Random.hs
diff --git a/packages/hmatrix/src/Numeric/GSL/Root.hs b/packages/gsl/src/Numeric/GSL/Root.hs
index b9f3b94..b9f3b94 100644
--- a/packages/hmatrix/src/Numeric/GSL/Root.hs
+++ b/packages/gsl/src/Numeric/GSL/Root.hs
diff --git a/packages/hmatrix/src/Numeric/GSL/Vector.hs b/packages/gsl/src/Numeric/GSL/Vector.hs
index af79f32..af79f32 100644
--- a/packages/hmatrix/src/Numeric/GSL/Vector.hs
+++ b/packages/gsl/src/Numeric/GSL/Vector.hs
diff --git a/packages/hmatrix/src/Numeric/GSL/gsl-aux.c b/packages/gsl/src/Numeric/GSL/gsl-aux.c
index ffc5c20..ffc5c20 100644
--- a/packages/hmatrix/src/Numeric/GSL/gsl-aux.c
+++ b/packages/gsl/src/Numeric/GSL/gsl-aux.c
diff --git a/packages/hmatrix/src/Numeric/GSL/gsl-ode.c b/packages/gsl/src/Numeric/GSL/gsl-ode.c
index 3f2771b..3f2771b 100644
--- a/packages/hmatrix/src/Numeric/GSL/gsl-ode.c
+++ b/packages/gsl/src/Numeric/GSL/gsl-ode.c
diff --git a/packages/special/hmatrix-special.cabal b/packages/special/hmatrix-special.cabal
index 3d1cc2d..89f4f80 100644
--- a/packages/special/hmatrix-special.cabal
+++ b/packages/special/hmatrix-special.cabal
@@ -27,7 +27,7 @@ flag safe-cheap
    default:        False
 library
-    Build-Depends:  base, hmatrix-base, hmatrix
+    Build-Depends:  base, hmatrix, hmatrix-gsl
    Extensions:     ForeignFunctionInterface,
                    CPP
diff --git a/packages/tests/hmatrix-tests.cabal b/packages/tests/hmatrix-tests.cabal
index 7f77f4a..5d18a68 100644
--- a/packages/tests/hmatrix-tests.cabal
+++ b/packages/tests/hmatrix-tests.cabal
@@ -21,7 +21,7 @@ extra-source-files: CHANGES
 library
    Build-Depends:      base >= 4 && < 5,
-                        hmatrix >= 0.16, hmatrix-base,
+                        hmatrix, hmatrix-gsl,
                        QuickCheck >= 2, HUnit, random
    hs-source-dirs:     src
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
index b5e7c72..e4f0846 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
@@ -26,6 +26,7 @@ module Numeric.LinearAlgebra.Tests(
 --import Data.Packed.Random
 import Numeric.LinearAlgebra
+import Numeric.Container
 import Numeric.LinearAlgebra.LAPACK
 import Numeric.LinearAlgebra.Tests.Instances
 import Numeric.LinearAlgebra.Tests.Properties
@@ -66,6 +67,11 @@ a ~~ b = fromList a |~| fromList b
 feye n = flipud (ident n) :: Matrix Double
+eps = peps :: Double
+i = 0 :+ 1 :: Complex Double
 -----------------------------------------------------------
 detTest1 = det m == 26
@@ -427,8 +433,6 @@ conformTest = utest "conform" ok
                   ,26,28,30
                   ,39,41,43
                   ,52,54,56]
-    row = asRow . fromList
-    col = asColumn . fromList :: [Double] -> Matrix Double
 ---------------------------------------------------------------------
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs
index 30bf690..b306f94 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Instances.hs
@@ -29,6 +29,8 @@ module Numeric.LinearAlgebra.Tests.Instances(
 import System.Random
 import Numeric.LinearAlgebra
+import Numeric.LinearAlgebra.Devel
+import Numeric.Container
 import Control.Monad(replicateM)
 import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector
                      ,sized,classify,Testable,Property
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs
index c96d3de..81cbf61 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests/Properties.hs
@@ -44,6 +44,8 @@ module Numeric.LinearAlgebra.Tests.Properties (
 ) where
 import Numeric.LinearAlgebra --hiding (real,complex)
+import Numeric.LinearAlgebra.Devel
+import Numeric.Container
 import Numeric.LinearAlgebra.LAPACK
 import Debug.Trace
 import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector