move LAPACK under LinearAlgebra

8 files changed, 39 insertions, 29 deletions

diff --git a/HSSL.cabal b/HSSL.cabal
index a3f4697..aac2155 100644
--- a/HSSL.cabal
+++ b/HSSL.cabal
@@ -3,13 +3,13 @@ Version:            0.1
 License:            GPL
 License-file:       LICENSE
 Author:             Alberto Ruiz
-Maintainer:         aruiz@um.es
+Maintainer:         Alberto Ruiz <aruiz@um.es>
 Stability:          provisional
---Homepage:           http://dis.um.es/~alberto/GSLHaskell
-Package-url:
+Homepage:           http://dis.um.es/~alberto/GSLHaskell
 Synopsis:           Simple Scientific Library
-Description:
-Category:           Numerical
+Description:        A high level functional interface to some linear algebra computations
+                    and other numerical routines, internally implemented using GSL, BLAS and LAPACK.
+Category:           Numerical, Math
 tested-with:        GHC ==6.6.1
 Build-Depends:      base, haskell98
 Extensions:         ForeignFunctionInterface
@@ -30,34 +30,44 @@ Exposed-modules:    Data.Packed.Internal,
                     GSL.Fourier,
                     GSL.Polynomials,
                     GSL.Minimization,
-                    GSL.Special, GSL.Special.Internal,
-                    GSL.Special.Gamma, GSL.Special.Erf,
-                    GSL.Special.Airy, GSL.Special.Exp,
-                    GSL.Special.Bessel, GSL.Special.Clausen,
-                    GSL.Special.Coulomb, GSL.Special.Coupling,
-                    GSL.Special.Dawson, GSL.Special.Debye,
-                    GSL.Special.Dilog, GSL.Special.Elementary,
+                    GSL.Special,
+                    GSL.Special.Internal,
+                    GSL.Special.Gamma,
+                    GSL.Special.Erf,
+                    GSL.Special.Airy,
+                    GSL.Special.Exp,
+                    GSL.Special.Bessel,
+                    GSL.Special.Clausen,
+                    GSL.Special.Coulomb,
+                    GSL.Special.Coupling,
+                    GSL.Special.Dawson,
+                    GSL.Special.Debye,
+                    GSL.Special.Dilog,
+                    GSL.Special.Elementary,
                     GSL.Special.Ellint,
-                    GSL.Special.Expint, GSL.Special.Fermi_dirac,
-                    GSL.Special.Gegenbauer, GSL.Special.Hyperg,
-                    GSL.Special.Laguerre, GSL.Special.Lambert,
-                    GSL.Special.Pow_int, GSL.Special.Psi,
-                    GSL.Special.Synchrotron, GSL.Special.Trig,
-                    GSL.Special.Zeta, GSL.Special.Log,
+                    GSL.Special.Expint,
+                    GSL.Special.Fermi_dirac,
+                    GSL.Special.Gegenbauer,
+                    GSL.Special.Hyperg,
+                    GSL.Special.Laguerre,
+                    GSL.Special.Lambert,
+                    GSL.Special.Pow_int,
+                    GSL.Special.Psi,
+                    GSL.Special.Synchrotron,
+                    GSL.Special.Trig,
+                    GSL.Special.Zeta,
+                    GSL.Special.Log,
                     GSL.Special.Legendre,
                     GSL,
-                    LAPACK,
                     LinearAlgebra,
+                    LinearAlgebra.LAPACK,
                     LinearAlgebra.Linear,
                     LinearAlgebra.Instances,
                     LinearAlgebra.Interface,
-                    LinearAlgebra.Algorithms
---                    , LinearAlgebra.Tests
-                    , Graphics.Plot
---                    , GSLHaskell
-Other-modules:
+                    LinearAlgebra.Algorithms,
+                    Graphics.Plot
 C-sources:          lib/Data/Packed/Internal/aux.c,
-                    lib/LAPACK/lapack-aux.c,
+                    lib/LinearAlgebra/LAPACK/lapack-aux.c,
                     lib/GSL/gsl-aux.c
 extra-libraries:    gsl cblas lapack
 cc-options:         -O4
diff --git a/examples/tests.hs b/examples/tests.hs
index 80070fd..e66774b 100644
--- a/examples/tests.hs
+++ b/examples/tests.hs
@@ -6,7 +6,7 @@ import Data.Packed.Internal((>|<), fdat, cdat, multiply', multiplyG, MatrixOrder
 import GSL hiding (sin,cos,exp,choose)
 import LinearAlgebra
 import LinearAlgebra.Linear(Linear)
-import LAPACK
+import LinearAlgebra.LAPACK
 import GSL.Matrix
 import Test.QuickCheck hiding (test)
 import Test.HUnit hiding ((~:),test)
diff --git a/lib/LinearAlgebra/Algorithms.hs b/lib/LinearAlgebra/Algorithms.hs
index 007067f..481dbd6 100644
--- a/lib/LinearAlgebra/Algorithms.hs
+++ b/lib/LinearAlgebra/Algorithms.hs
@@ -46,7 +46,7 @@ import Data.Packed.Internal hiding (fromComplex, toComplex, comp, conj)
 import Data.Packed
 import GSL.Matrix(luR,luC,qr)
 import GSL.Vector
-import LAPACK
+import LinearAlgebra.LAPACK as LAPACK
 import Complex
 import LinearAlgebra.Linear
 
diff --git a/lib/LAPACK.hs b/lib/LinearAlgebra/LAPACK.hs
index 43a313b..2861061 100644
--- a/lib/LAPACK.hs
+++ b/lib/LinearAlgebra/LAPACK.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 -- |
--- Module      :  LAPACK
+-- Module      :  LinearAlgebra.LAPACK
 -- Copyright   :  (c) Alberto Ruiz 2006-7
 -- License     :  GPL-style
 -- 
@@ -13,7 +13,7 @@
 --
 -----------------------------------------------------------------------------
 
-module LAPACK (
+module LinearAlgebra.LAPACK (
     svdR, svdRdd, svdC,
     eigC, eigR, eigS, eigH,
     linearSolveR, linearSolveC,
diff --git a/lib/LAPACK/clapack.h b/lib/LinearAlgebra/LAPACK/clapack.h
index cad9a4c..cad9a4c 100644
--- a/lib/LAPACK/clapack.h
+++ b/lib/LinearAlgebra/LAPACK/clapack.h
diff --git a/lib/LAPACK/f2c.h b/lib/LinearAlgebra/LAPACK/f2c.h
index b94ee7c..b94ee7c 100644
--- a/lib/LAPACK/f2c.h
+++ b/lib/LinearAlgebra/LAPACK/f2c.h
diff --git a/lib/LAPACK/lapack-aux.c b/lib/LinearAlgebra/LAPACK/lapack-aux.c
index 4ef9a6e..4ef9a6e 100644
--- a/lib/LAPACK/lapack-aux.c
+++ b/lib/LinearAlgebra/LAPACK/lapack-aux.c
diff --git a/lib/LAPACK/lapack-aux.h b/lib/LinearAlgebra/LAPACK/lapack-aux.h
index ea71847..ea71847 100644
--- a/lib/LAPACK/lapack-aux.h
+++ b/lib/LinearAlgebra/LAPACK/lapack-aux.h