code refactoring

9 files changed, 79 insertions, 71 deletions

diff --git a/HSSL.cabal b/HSSL.cabal
index 3f38cf1..9fd148a 100644
--- a/HSSL.cabal
+++ b/HSSL.cabal
@@ -13,10 +13,8 @@ Category:           Numerical
 tested-with:        GHC ==6.6.1
 Build-Depends:      base, haskell98
 Extensions:         ForeignFunctionInterface
---                    MultiParamTypeClasses,
---                    FunctionalDependencies
 --ghc-options:        -Wall
-ghc-options:        -O0
+ghc-options:        -O
 hs-source-dirs:     lib
 Exposed-modules:    Data.Packed.Internal,
                     Data.Packed.Internal.Common,
@@ -25,11 +23,12 @@ Exposed-modules:    Data.Packed.Internal,
                     Data.Packed.Vector,
                     Data.Packed.Matrix,
                     GSL.Vector,
-                    LinearAlgebra.Linear,
-                    Data.Packed.Plot,
-                    LAPACK,
                     GSL.Matrix,
-                    GSL.Differentiation, GSL.Integration,
+                    GSL.Differentiation,
+                    GSL.Integration,
+                    GSL.Fourier,
+                    GSL.Polynomials,
+                    GSL.Minimization,
                     GSL.Special, GSL.Special.Internal,
                     GSL.Special.Gamma, GSL.Special.Erf,
                     GSL.Special.Airy, GSL.Special.Exp,
@@ -45,12 +44,12 @@ Exposed-modules:    Data.Packed.Internal,
                     GSL.Special.Synchrotron, GSL.Special.Trig,
                     GSL.Special.Zeta, GSL.Special.Log,
                     GSL.Special.Legendre,
-                    GSL.Fourier,
-                    GSL.Polynomials,
-                    GSL.Minimization,
-                    GSL.Compat,
                     GSL,
-                    LinearAlgebra, LinearAlgebra.Algorithms
+                    LAPACK,
+                    LinearAlgebra,
+                    LinearAlgebra.Linear,
+                    LinearAlgebra.Algorithms
+                    , GSLHaskell, Graphics.Plot
 Other-modules:
 C-sources:          lib/Data/Packed/Internal/aux.c,
                     lib/LAPACK/lapack-aux.c,
diff --git a/examples/oldtests.hs b/examples/oldtests.hs
index 5b0e9b4..b01675f 100644
--- a/examples/oldtests.hs
+++ b/examples/oldtests.hs
@@ -1,9 +1,5 @@
 import Test.HUnit
-
-import GSL
-import GSL.Special hiding (exp)
-import GSL.Matrix
-import LinearAlgebra.Linear
+import GSLHaskell
 import System.Random(randomRs,mkStdGen)
 
 realMatrix = fromLists :: [[Double]] -> Matrix Double
diff --git a/examples/tests.hs b/examples/tests.hs
index 0d8361e..0a09ced 100644
--- a/examples/tests.hs
+++ b/examples/tests.hs
@@ -23,7 +23,7 @@ import Complex
 import LinearAlgebra.Algorithms
 import LinearAlgebra.Linear
 import GSL.Matrix
-import GSL.Compat hiding ((<>),constant)
+import GSLHaskell hiding ((<>),constant)
 
 dist :: (Normed t, Num t) => t -> t -> Double
 dist a b = norm (a-b)
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index f9dd9a9..89a162a 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -171,7 +171,7 @@ compat m1 m2 = rows m1 == rows m2 && cols m1 == cols m2
 ----------------------------------------------------------------
 
 -- | Optimized matrix computations are provided for elements in the Field class.
-class Storable a => Field a where
+class (Storable a, Num a) => Field a where
     constantD :: a -> Int -> Vector a
     transdata :: Int -> Vector a -> Int -> Vector a
     multiplyD :: Matrix a -> Matrix a -> Matrix a
diff --git a/lib/Data/Packed/Vector.hs b/lib/Data/Packed/Vector.hs
index 9818d58..3fc625c 100644
--- a/lib/Data/Packed/Vector.hs
+++ b/lib/Data/Packed/Vector.hs
@@ -18,12 +18,13 @@ module Data.Packed.Vector (
     dim, (@>),
     subVector, join,
     constant, linspace,
-
+    vectorMax, vectorMin, vectorMaxIndex, vectorMinIndex,
     liftVector, liftVector2
 ) where
 
 import Data.Packed.Internal
 import Complex
+import GSL.Vector
 
 {- | Creates a real vector containing a range of values:
 
@@ -33,3 +34,15 @@ import Complex
 linspace :: Int -> (Double, Double) -> Vector Double
 linspace n (a,b) = fromList [a, a+delta .. b]
     where delta = (b-a)/(fromIntegral n -1)
+
+vectorMax :: Vector Double -> Double
+vectorMax = toScalarR Max
+
+vectorMin :: Vector Double -> Double
+vectorMin = toScalarR Min
+
+vectorMaxIndex :: Vector Double -> Int
+vectorMaxIndex = round . toScalarR MaxIdx
+
+vectorMinIndex :: Vector Double -> Int
+vectorMinIndex = round . toScalarR MinIdx
diff --git a/lib/GSL.hs b/lib/GSL.hs
index 84df81b..8b6365b 100644
--- a/lib/GSL.hs
+++ b/lib/GSL.hs
@@ -8,43 +8,25 @@ Maintainer  :  Alberto Ruiz (aruiz at um dot es)
 Stability   :  provisional
 Portability :  uses -fffi and -fglasgow-exts
 
-This module reexports the basic functionality and a collection of utilities (old interface)
+This module reexports all the GSL functions (except those in "LinearAlgebra").
 
 -}
 
 module GSL (
-
-module Data.Packed.Vector,
-module Data.Packed.Matrix,
---module Data.Packed.Tensor,
-module LinearAlgebra.Algorithms,
-module LAPACK,
-module GSL.Integration,
-module GSL.Differentiation,
-module GSL.Fourier,
-module GSL.Polynomials,
-module GSL.Minimization,
-module GSL.Matrix,
-module GSL.Compat,
-module Data.Packed.Plot,
-module Complex,
-
-setErrorHandlerOff
-
+  module GSL.Integration
+, module GSL.Differentiation
+, module GSL.Fourier
+, module GSL.Polynomials
+, module GSL.Minimization
+, module GSL.Special
+, module Complex
 ) where
 
-import Data.Packed.Vector hiding (constant)
-import Data.Packed.Matrix hiding ((><))
-import LinearAlgebra.Algorithms hiding (pnorm)
-import LAPACK
 import GSL.Integration
 import GSL.Differentiation
 import GSL.Special
 import GSL.Fourier
 import GSL.Polynomials
 import GSL.Minimization
-import GSL.Matrix
-import GSL.Compat
-import Data.Packed.Plot
 import Complex
-import GSL.Special(setErrorHandlerOff)
+import GSL.Special
diff --git a/lib/GSL/Compat.hs b/lib/GSLHaskell.hs
index 8a59915..e65ff28 100644
--- a/lib/GSL/Compat.hs
+++ b/lib/GSLHaskell.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances #-}
 -----------------------------------------------------------------------------
 {- |
-Module      :  GSL.Compat
+Module      :  GSLHaskell
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 
@@ -9,23 +9,53 @@ Maintainer  :  Alberto Ruiz (aruiz at um dot es)
 Stability   :  provisional
 Portability :  uses -fffi and -fglasgow-exts
 
-Creates reasonable numeric instances for Vectors and Matrices. In the context of the standard numeric operators, one-component vectors and matrices automatically expand to match the dimensions of the other operand.
+GSLHaskell interface, with reasonable numeric instances for Vectors and Matrices. In the context of the standard numeric operators, one-component vectors and matrices automatically expand to match the dimensions of the other operand.
 
 -}
 -----------------------------------------------------------------------------
 
-module GSL.Compat(
-  Mul,(<>), readMatrix, size, dispR, dispC, format, gmap, Joinable, (<|>),(<->), GSL.Compat.constant,
-  vectorMax, vectorMin, vectorMaxIndex, vectorMinIndex, fromArray2D, fromComplex, GSL.Compat.pnorm, scale
+module GSLHaskell(
+    module Data.Packed.Vector,
+    module Data.Packed.Matrix,
+    module LinearAlgebra.Algorithms,
+    module LAPACK,
+    module GSL.Integration,
+    module GSL.Differentiation,
+    module GSL.Fourier,
+    module GSL.Polynomials,
+    module GSL.Minimization,
+    module GSL.Matrix,
+    module GSL.Special,
+    module Graphics.Plot,
+    module Complex,
+    Mul,(<>), readMatrix, size, dispR, dispC, format, gmap, Joinable, (<|>),(<->), GSLHaskell.constant,
+    fromArray2D, fromComplex, toComplex, GSLHaskell.pnorm, scale, outer
 ) where
 
+
+import LAPACK
+import GSL.Integration
+import GSL.Differentiation
+import GSL.Fourier
+import GSL.Polynomials
+import GSL.Minimization
+import GSL.Matrix
+import Graphics.Plot
+import Complex
+import GSL.Special(setErrorHandlerOff,
+    erf,
+    erf_Z,
+    bessel_J0_e,
+    exp_e10_e,
+    gamma)
 import Data.Packed.Internal hiding (dsp)
-import Data.Packed.Vector
+import Data.Packed.Vector hiding (constant)
 import Data.Packed.Matrix
+import Data.Packed.Matrix hiding ((><))
 import GSL.Vector
 import LinearAlgebra.Linear
-import GSL.Matrix
-import LinearAlgebra.Algorithms
+import qualified LinearAlgebra.Algorithms
+import LinearAlgebra.Algorithms hiding (pnorm)
 import Complex
 import Numeric(showGFloat)
 import Data.List(transpose,intersperse)
@@ -437,18 +467,6 @@ a <-> b = joinV a b
 
 ----------------------------------------------------------
 
-vectorMax :: Vector Double -> Double
-vectorMax = toScalarR Max
-
-vectorMin :: Vector Double -> Double
-vectorMin = toScalarR Min
-
-vectorMaxIndex :: Vector Double -> Int
-vectorMaxIndex = round . toScalarR MaxIdx
-
-vectorMinIndex :: Vector Double -> Int
-vectorMinIndex = round . toScalarR MinIdx
-
 fromArray2D :: (Field e) => Array (Int, Int) e -> Matrix e
 fromArray2D m = (r><c) (elems m)
     where ((r0,c0),(r1,c1)) = bounds m
diff --git a/lib/Data/Packed/Plot.hs b/lib/Graphics/Plot.hs
index 7d63426..9f719ab 100644
--- a/lib/Data/Packed/Plot.hs
+++ b/lib/Graphics/Plot.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  Data.Packed.Plot
+-- Module      :  Graphics.Plot
 -- Copyright   :  (c) Alberto Ruiz 2005
 -- License     :  GPL-style
 -- 
@@ -12,7 +12,7 @@
 --
 -----------------------------------------------------------------------------
 
-module Data.Packed.Plot(
+module Graphics.Plot(
 
     gnuplotX, mplot,
 
diff --git a/lib/LinearAlgebra/Linear.hs b/lib/LinearAlgebra/Linear.hs
index 51b32f5..53e011f 100644
--- a/lib/LinearAlgebra/Linear.hs
+++ b/lib/LinearAlgebra/Linear.hs
@@ -27,7 +27,7 @@ import GSL.Vector
 import Complex
 
 
-class (Num e, Field e) => Linear c e where
+class (Field e) => Linear c e where
     scale       :: e -> c e -> c e
     addConstant :: e -> c e -> c e
     add         :: c e -> c e -> c e
@@ -68,5 +68,5 @@ dot u v = dat (multiply r c) `at` 0
  , 10.0, 4.0, 6.0
  , 15.0, 6.0, 9.0 ]@
 -}
-outer :: (Num t, Field t) => Vector t -> Vector t -> Matrix t
+outer :: (Field t) => Vector t -> Vector t -> Matrix t
 outer u v = asColumn u `multiply` asRow v