explicit export lists in internal modules

12 files changed, 105 insertions, 68 deletions

diff --git a/CHANGES b/CHANGES
index 7d80f7d..64450e4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,3 +9,5 @@
   rank 1" decomposition with zero singular value.
 
 - added NFData instances for Matrix and Vector.
+
+- liftVector, liftVector2 replaced by mapVector, zipVector.
diff --git a/hmatrix.cabal b/hmatrix.cabal
index 4c87665..4cd4402 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -131,6 +131,7 @@ library
                         Data.Packed.Development
     other-modules:      Data.Packed.Internal,
                         Data.Packed.Internal.Common,
+                        Data.Packed.Internal.Signatures,
                         Data.Packed.Internal.Vector,
                         Data.Packed.Internal.Matrix,
                         Numeric.GSL.Internal,
@@ -140,7 +141,7 @@ library
     C-sources:          lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c,
                         lib/Numeric/GSL/gsl-aux.c
 
---    ghc-prof-options:   -auto-all
+    ghc-prof-options:   -auto
 
     ghc-options:        -Wall -fno-warn-missing-signatures
                               -fno-warn-orphans
diff --git a/lib/Data/Packed/Internal.hs b/lib/Data/Packed/Internal.hs
index 0bf9f8c..537e51e 100644
--- a/lib/Data/Packed/Internal.hs
+++ b/lib/Data/Packed/Internal.hs
@@ -15,10 +15,12 @@
 
 module Data.Packed.Internal (
     module Data.Packed.Internal.Common,
+    module Data.Packed.Internal.Signatures,
     module Data.Packed.Internal.Vector,
     module Data.Packed.Internal.Matrix,
 ) where
 
 import Data.Packed.Internal.Common
+import Data.Packed.Internal.Signatures
 import Data.Packed.Internal.Vector
 import Data.Packed.Internal.Matrix
diff --git a/lib/Data/Packed/Internal/Common.hs b/lib/Data/Packed/Internal/Common.hs
index 879dade..629016d 100644
--- a/lib/Data/Packed/Internal/Common.hs
+++ b/lib/Data/Packed/Internal/Common.hs
@@ -14,25 +14,20 @@
 -----------------------------------------------------------------------------
 -- #hide
 
-module Data.Packed.Internal.Common where
+module Data.Packed.Internal.Common(
+  Adapt,
+  app1, app2, app3, app4,
+  (//), check,
+  partit, common,
+  fi
+) where
 
 import Foreign
-import Complex
 import Control.Monad(when)
-import Debug.Trace
 import Foreign.C.String(peekCString)
 import Foreign.C.Types
 import Foreign.Storable.Complex()
 
-
--- | @debug x = trace (show x) x@
-debug :: (Show a) => a -> a
-debug x = trace (show x) x
-
--- | useful for expressions like @sortBy (compare \`on\` length)@
-on :: (a -> a -> b) -> (t -> a) -> t -> t -> b
-on f g = \x y -> f (g x) (g y)
-
 -- | @partit 3 [1..9] == [[1,2,3],[4,5,6],[7,8,9]]@
 partit :: Int -> [a] -> [[a]]
 partit _ [] = []
@@ -139,42 +134,3 @@ check msg f = do
 
 -- | description of GSL error codes
 foreign import ccall "auxi.h gsl_strerror" gsl_strerror :: CInt -> IO (Ptr CChar)
-
----------------------------------------------------
----------- signatures of the C functions ---------
---------------------------------------------------
-type PD = Ptr Double                            --
-type PC = Ptr (Complex Double)                  --
-type TV = CInt -> PD -> IO CInt                 --
-type TVV = CInt -> PD -> TV                     --
-type TVVV = CInt -> PD -> TVV                   --
-type TM = CInt -> CInt -> PD -> IO CInt         --
-type TMM =  CInt -> CInt -> PD -> TM            --
-type TVMM = CInt -> PD -> TMM                   --
-type TMVMM = CInt -> CInt -> PD -> TVMM         --
-type TMMM =  CInt -> CInt -> PD -> TMM          --
-type TVM = CInt -> PD -> TM                     --
-type TVVM = CInt -> PD -> TVM                   --
-type TMV = CInt -> CInt -> PD -> TV             --
-type TMMV = CInt -> CInt -> PD -> TMV           --
-type TMVM = CInt -> CInt -> PD -> TVM           --
-type TMMVM = CInt -> CInt -> PD -> TMVM         --
-type TCM = CInt -> CInt -> PC -> IO CInt        --
-type TCVCM = CInt -> PC -> TCM                  --
-type TCMCVCM = CInt -> CInt -> PC -> TCVCM      --
-type TMCMCVCM = CInt -> CInt -> PD -> TCMCVCM   --
-type TCMCMCVCM = CInt -> CInt -> PC -> TCMCVCM  --
-type TCMCM = CInt -> CInt -> PC -> TCM          --
-type TVCM = CInt -> PD -> TCM                   --
-type TCMVCM = CInt -> CInt -> PC -> TVCM        --
-type TCMCMVCM = CInt -> CInt -> PC -> TCMVCM    --
-type TCMCMCM = CInt -> CInt -> PC -> TCMCM      --
-type TCV = CInt -> PC -> IO CInt                --
-type TCVCV = CInt -> PC -> TCV                  --
-type TCVCVCV = CInt -> PC -> TCVCV              --
-type TCMCV = CInt -> CInt -> PC -> TCV          --
-type TVCV = CInt -> PD -> TCV                   --
-type TCVM = CInt -> PC -> TM                    --
-type TMCVM = CInt -> CInt -> PD -> TCVM         --
-type TMMCVM = CInt -> CInt -> PD -> TMCVM       --
---------------------------------------------------
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index 9dc90af..a220f1a 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -15,9 +15,26 @@
 -----------------------------------------------------------------------------
 -- #hide
 
-module Data.Packed.Internal.Matrix where
+module Data.Packed.Internal.Matrix(
+    Matrix(..),
+    MatrixOrder(..), orderOf,
+    createMatrix, withMatrix, mat,
+    cmat, fmat,
+    toLists, flatten, reshape,
+    Element(..),
+    trans,
+    fromRows, toRows, fromColumns, toColumns,
+    matrixFromVector,
+    subMatrix,
+    liftMatrix, liftMatrix2,
+    (@@>),
+    saveMatrix,
+    fromComplex, toComplex, conj,
+    singleton
+) where
 
 import Data.Packed.Internal.Common
+import Data.Packed.Internal.Signatures
 import Data.Packed.Internal.Vector
 
 import Foreign hiding (xor)
diff --git a/lib/Data/Packed/Internal/Signatures.hs b/lib/Data/Packed/Internal/Signatures.hs
new file mode 100644
index 0000000..67d2bfc
--- /dev/null
+++ b/lib/Data/Packed/Internal/Signatures.hs
@@ -0,0 +1,54 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Data.Packed.Internal.Signatures
+-- Copyright   :  (c) Alberto Ruiz 2009
+-- License     :  GPL-style
+--
+-- Maintainer  :  Alberto Ruiz <aruiz@um.es>
+-- Stability   :  provisional
+-- Portability :  portable (uses FFI)
+--
+-- Signatures of the C functions.
+--
+-----------------------------------------------------------------------------
+
+module Data.Packed.Internal.Signatures where
+
+import Foreign
+import Complex
+import Foreign.C.Types
+
+type PD = Ptr Double                            --
+type PC = Ptr (Complex Double)                  --
+type TV = CInt -> PD -> IO CInt                 --
+type TVV = CInt -> PD -> TV                     --
+type TVVV = CInt -> PD -> TVV                   --
+type TM = CInt -> CInt -> PD -> IO CInt         --
+type TMM =  CInt -> CInt -> PD -> TM            --
+type TVMM = CInt -> PD -> TMM                   --
+type TMVMM = CInt -> CInt -> PD -> TVMM         --
+type TMMM =  CInt -> CInt -> PD -> TMM          --
+type TVM = CInt -> PD -> TM                     --
+type TVVM = CInt -> PD -> TVM                   --
+type TMV = CInt -> CInt -> PD -> TV             --
+type TMMV = CInt -> CInt -> PD -> TMV           --
+type TMVM = CInt -> CInt -> PD -> TVM           --
+type TMMVM = CInt -> CInt -> PD -> TMVM         --
+type TCM = CInt -> CInt -> PC -> IO CInt        --
+type TCVCM = CInt -> PC -> TCM                  --
+type TCMCVCM = CInt -> CInt -> PC -> TCVCM      --
+type TMCMCVCM = CInt -> CInt -> PD -> TCMCVCM   --
+type TCMCMCVCM = CInt -> CInt -> PC -> TCMCVCM  --
+type TCMCM = CInt -> CInt -> PC -> TCM          --
+type TVCM = CInt -> PD -> TCM                   --
+type TCMVCM = CInt -> CInt -> PC -> TVCM        --
+type TCMCMVCM = CInt -> CInt -> PC -> TCMVCM    --
+type TCMCMCM = CInt -> CInt -> PC -> TCMCM      --
+type TCV = CInt -> PC -> IO CInt                --
+type TCVCV = CInt -> PC -> TCV                  --
+type TCVCVCV = CInt -> PC -> TCVCV              --
+type TCMCV = CInt -> CInt -> PC -> TCV          --
+type TVCV = CInt -> PD -> TCV                   --
+type TCVM = CInt -> PC -> TM                    --
+type TMCVM = CInt -> CInt -> PD -> TCVM         --
+type TMMCVM = CInt -> CInt -> PD -> TMCVM       --
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index ac0f176..009297a 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -14,9 +14,20 @@
 -----------------------------------------------------------------------------
 -- #hide
 
-module Data.Packed.Internal.Vector where
+module Data.Packed.Internal.Vector (
+    Vector(..),
+    fromList, toList, (|>),
+    join, (@>), safe, at, at', subVector,
+    mapVector, zipVector,
+    foldVector, foldVectorG, foldLoop,
+    createVector, withVector, vec,
+    asComplex, asReal,
+    fwriteVector, freadVector, fprintfVector, fscanfVector,
+    cloneVector
+) where
 
 import Data.Packed.Internal.Common
+import Data.Packed.Internal.Signatures
 import Foreign
 import Foreign.C.String
 import Foreign.C.Types(CInt,CChar)
@@ -194,12 +205,6 @@ asComplex v = V { dim = dim v `div` 2, fptr =  castForeignPtr (fptr v) }
 
 ----------------------------------------------------------------
 
-liftVector f x = mapVector f x
-
-liftVector2 f u v = zipVector f u v
-
------------------------------------------------------------------
-
 cloneVector :: Storable t => Vector t -> IO (Vector t)
 cloneVector (v@V {dim=n}) = do
         r <- createVector n
diff --git a/lib/Data/Packed/Vector.hs b/lib/Data/Packed/Vector.hs
index c657e10..21f51e5 100644
--- a/lib/Data/Packed/Vector.hs
+++ b/lib/Data/Packed/Vector.hs
@@ -21,7 +21,6 @@ module Data.Packed.Vector (
     vectorMax, vectorMin, vectorMaxIndex, vectorMinIndex,
     mapVector, zipVector,
     fscanfVector, fprintfVector, freadVector, fwriteVector,
-    liftVector, liftVector2,
     foldLoop, foldVector, foldVectorG
 ) where
 
diff --git a/lib/Numeric/GSL/Minimization.hs b/lib/Numeric/GSL/Minimization.hs
index 930fe8a..a595da9 100644
--- a/lib/Numeric/GSL/Minimization.hs
+++ b/lib/Numeric/GSL/Minimization.hs
@@ -115,7 +115,7 @@ minimizeD method = minimizeDGen (fi (fromEnum method))
 
 -------------------------------------------------------------------------
 
-
+ww2 w1 o1 w2 o2 f = w1 o1 $ \a1 -> w2 o2 $ \a2 -> f a1 a2
 
 minimizeGen method eps maxit sz f xi = unsafePerformIO $ do
     let xiv = fromList xi
diff --git a/lib/Numeric/GSL/Vector.hs b/lib/Numeric/GSL/Vector.hs
index 92cda87..0366744 100644
--- a/lib/Numeric/GSL/Vector.hs
+++ b/lib/Numeric/GSL/Vector.hs
@@ -21,6 +21,7 @@ module Numeric.GSL.Vector (
 ) where
 
 import Data.Packed.Internal.Common
+import Data.Packed.Internal.Signatures
 import Data.Packed.Internal.Vector
 
 import Complex
diff --git a/lib/Numeric/LinearAlgebra/Algorithms.hs b/lib/Numeric/LinearAlgebra/Algorithms.hs
index 110619a..f749cc1 100644
--- a/lib/Numeric/LinearAlgebra/Algorithms.hs
+++ b/lib/Numeric/LinearAlgebra/Algorithms.hs
@@ -310,8 +310,8 @@ pnormRV Infinity = vectorMax . vectorMapR Abs
 --pnormRV _ = error "pnormRV not yet defined"
 
 pnormCV PNorm2 = norm2 . asReal
-pnormCV PNorm1 = norm1 . liftVector magnitude
-pnormCV Infinity = vectorMax . liftVector magnitude
+pnormCV PNorm1 = norm1 . mapVector magnitude
+pnormCV Infinity = vectorMax . mapVector magnitude
 --pnormCV _ = error "pnormCV not yet defined"
 
 pnormRM PNorm2 m = head (toList s) where (_,s,_) = svdR m
@@ -320,8 +320,8 @@ pnormRM Infinity m = vectorMax $ liftMatrix (vectorMapR Abs) m `mXv` constant 1
 --pnormRM _ _ = error "p norm not yet defined"
 
 pnormCM PNorm2 m = head (toList s) where (_,s,_) = svdC m
-pnormCM PNorm1 m = vectorMax $ constant 1 (rows m) `vXm` liftMatrix (liftVector magnitude) m
-pnormCM Infinity m = vectorMax $ liftMatrix (liftVector magnitude) m `mXv` constant 1 (cols m)
+pnormCM PNorm1 m = vectorMax $ constant 1 (rows m) `vXm` liftMatrix (mapVector magnitude) m
+pnormCM Infinity m = vectorMax $ liftMatrix (mapVector magnitude) m `mXv` constant 1 (cols m)
 --pnormCM _ _ = error "p norm not yet defined"
 
 -- | Objects which have a p-norm.
@@ -489,7 +489,7 @@ diagonalize m = if rank v == n
 --
 matFunc :: Field t => (Complex Double -> Complex Double) -> Matrix t -> Matrix (Complex Double)
 matFunc f m = case diagonalize (complex m) of
-    Just (l,v) -> v `mXm` diag (liftVector f l) `mXm` inv v
+    Just (l,v) -> v `mXm` diag (mapVector f l) `mXm` inv v
     Nothing -> error "Sorry, matFunc requires a diagonalizable matrix" 
 
 --------------------------------------------------------------
diff --git a/lib/Numeric/LinearAlgebra/Linear.hs b/lib/Numeric/LinearAlgebra/Linear.hs
index 9bf60e2..0426bb7 100644
--- a/lib/Numeric/LinearAlgebra/Linear.hs
+++ b/lib/Numeric/LinearAlgebra/Linear.hs
@@ -55,7 +55,7 @@ instance Linear Vector (Complex Double) where
     sub = vectorZipC Sub
     mul = vectorZipC Mul
     divide = vectorZipC Div
-    equal u v = dim u == dim v && vectorMax (liftVector magnitude (sub u v)) == 0.0
+    equal u v = dim u == dim v && vectorMax (mapVector magnitude (sub u v)) == 0.0
 
 instance (Linear Vector a, Container Matrix a) => (Linear Matrix a) where
     scale x = liftMatrix (scale x)