simplify modules

8 files changed, 42 insertions, 24 deletions

diff --git a/lib/Data/Packed/Random.hs b/lib/Data/Packed/Random.hs
index 260e4dc..e57ba6e 100644
--- a/lib/Data/Packed/Random.hs
+++ b/lib/Data/Packed/Random.hs
@@ -20,10 +20,9 @@ module Data.Packed.Random (
 ) where
 
 import Numeric.GSL.Vector
-import Data.Packed
-import Numeric.LinearAlgebra.Linear
+import Data.Packed.Matrix
+import Data.Packed.Vector
 import Numeric.LinearAlgebra.Algorithms
-import Numeric.LinearAlgebra.Instances()
 import Numeric.LinearAlgebra.Interface
 
 -- | Obtains a matrix whose rows are pseudorandom samples from a multivariate
diff --git a/lib/Graphics/Plot.hs b/lib/Graphics/Plot.hs
index 3f66d98..b4e8a11 100644
--- a/lib/Graphics/Plot.hs
+++ b/lib/Graphics/Plot.hs
@@ -24,7 +24,7 @@ module Graphics.Plot(
 
     matrixToPGM, imshow,
 
-    gnuplotX, gnuplotpdf
+    gnuplotX, gnuplotpdf, gnuplotWin
 
 ) where
 
@@ -204,3 +204,19 @@ gnuplotpdf title command ds = gnuplot (prelude ++ command ++" "++ draw) >> postp
         _ <- system "gnuplot gnuplotcommand"
         _ <- system "rm gnuplotcommand"
         return ()
+
+gnuplotWin :: String -> String -> [([[Double]], String)] -> IO ()
+gnuplotWin title command ds = gnuplot (prelude ++ command ++" "++ draw) where
+    (dats,defs) = unzip ds
+    draw = concat (intersperse ", " (map ("\"-\" "++) defs)) ++ "\n" ++
+           concatMap pr dats
+
+    pr = (++"e\n") . unlines . map (unwords . (map show))
+
+    prelude = "set title \""++title++"\";"
+
+    gnuplot cmd = do
+        writeFile "gnuplotcommand" cmd
+        _ <- system "gnuplot -persist gnuplotcommand"
+        _ <- system "rm gnuplotcommand"
+        return ()
diff --git a/lib/Numeric/GSL.hs b/lib/Numeric/GSL.hs
index ae4c81e..e53022e 100644
--- a/lib/Numeric/GSL.hs
+++ b/lib/Numeric/GSL.hs
@@ -8,7 +8,9 @@ Maintainer  :  Alberto Ruiz (aruiz at um dot es)
 Stability   :  provisional
 Portability :  uses -fffi and -fglasgow-exts
 
-This module reexports all the available GSL functions (except those in "Numeric.LinearAlgebra").
+This module reexports all available GSL functions.
+
+The GSL special functions are in the separate package hmatrix-special.
 
 -}
 
diff --git a/lib/Numeric/GSL/ODE.hs b/lib/Numeric/GSL/ODE.hs
index eca06f8..912e8a8 100644
--- a/lib/Numeric/GSL/ODE.hs
+++ b/lib/Numeric/GSL/ODE.hs
@@ -33,7 +33,6 @@ module Numeric.GSL.ODE (
 ) where
 
 import Data.Packed.Internal
-import Data.Packed.Matrix
 import Foreign
 import Foreign.C.Types(CInt)
 import Numeric.GSL.Internal
diff --git a/lib/Numeric/LinearAlgebra.hs b/lib/Numeric/LinearAlgebra.hs
index 337c007..2652f2d 100644
--- a/lib/Numeric/LinearAlgebra.hs
+++ b/lib/Numeric/LinearAlgebra.hs
@@ -8,23 +8,19 @@ Maintainer  :  Alberto Ruiz (aruiz at um dot es)
 Stability   :  provisional
 Portability :  uses ffi
 
-Basic matrix computations implemented by BLAS, LAPACK and GSL.
-
-This module reexports the most comon functions (including "Numeric.LinearAlgebra.Instances").
+This module reexports all normally required functions for Linear Algebra applications.
 
 -}
 -----------------------------------------------------------------------------
 module Numeric.LinearAlgebra (
     module Data.Packed,
     module Data.Packed.Random,
-    module Numeric.LinearAlgebra.Linear,
     module Numeric.LinearAlgebra.Algorithms,
     module Numeric.LinearAlgebra.Interface
 ) where
 
 import Data.Packed
 import Data.Packed.Random
-import Numeric.LinearAlgebra.Linear
 import Numeric.LinearAlgebra.Algorithms
 import Numeric.LinearAlgebra.Instances()
 import Numeric.LinearAlgebra.Interface
diff --git a/lib/Numeric/LinearAlgebra/Algorithms.hs b/lib/Numeric/LinearAlgebra/Algorithms.hs
index fc2fcb2..7de9587 100644
--- a/lib/Numeric/LinearAlgebra/Algorithms.hs
+++ b/lib/Numeric/LinearAlgebra/Algorithms.hs
@@ -66,6 +66,7 @@ module Numeric.LinearAlgebra.Algorithms (
 -- * Misc
     ctrans,
     eps, i,
+    Linear(..),
 -- * Util
     haussholder,
     unpackQR, unpackHess,
diff --git a/lib/Numeric/LinearAlgebra/Interface.hs b/lib/Numeric/LinearAlgebra/Interface.hs
index b74180f..750670b 100644
--- a/lib/Numeric/LinearAlgebra/Interface.hs
+++ b/lib/Numeric/LinearAlgebra/Interface.hs
@@ -9,7 +9,12 @@ Maintainer  :  Alberto Ruiz (aruiz at um dot es)
 Stability   :  provisional
 Portability :  portable
 
-(Very provisional) operators for frequent operations.
+Operators for frequent operations.
+
+This module exports Show, Read, Eq, Num, Fractional, and Floating instances for Vector and Matrix.
+
+In the context of the standard numeric operators, one-component vectors and matrices automatically expand to match the dimensions of the other operand.
+
 
 -}
 -----------------------------------------------------------------------------
@@ -21,14 +26,14 @@ module Numeric.LinearAlgebra.Interface(
     (<|>),(<->),
 ) where
 
-import Numeric.LinearAlgebra.Linear
+import Numeric.LinearAlgebra.Instances()
 import Data.Packed.Vector
 import Data.Packed.Matrix
 import Numeric.LinearAlgebra.Algorithms
 
 class Mul a b c | a b -> c where
  infixl 7 <>
- -- | matrix product
+ -- | Matrix-matrix, matrix-vector, and vector-matrix products.
  (<>) :: Field t => a t -> b t -> c t
 
 instance Mul Matrix Matrix Matrix where
@@ -42,7 +47,7 @@ instance Mul Vector Matrix Vector where
 
 ---------------------------------------------------
 
--- | @u \<.\> v = dot u v@
+-- | Dot product: @u \<.\> v = dot u v@
 (<.>) :: (Field t) => Vector t -> Vector t -> t
 infixl 7 <.>
 (<.>) = dot
@@ -51,8 +56,8 @@ infixl 7 <.>
 
 {-# DEPRECATED (.*) "use scale a x or scalar a * x" #-}
 
--- | @x .* a = scale x a@
-(.*) :: (Linear c a) => a -> c a -> c a
+-- -- | @x .* a = scale x a@
+-- (.*) :: (Linear c a) => a -> c a -> c a
 infixl 7 .*
 a .* x = scale a x
 
@@ -60,8 +65,8 @@ a .* x = scale a x
 
 {-# DEPRECATED (*/) "use scale (recip a) x or x / scalar a" #-}
 
--- | @a *\/ x = scale (recip x) a@
-(*/) :: (Linear c a) => c a -> a -> c a
+-- -- | @a *\/ x = scale (recip x) a@
+-- (*/) :: (Linear c a) => c a -> a -> c a
 infixl 7 */
 v */ x = scale (recip x) v
 
@@ -94,7 +99,7 @@ instance Joinable Vector Matrix where
 infixl 4 <|>
 infixl 3 <->
 
-{- | Horizontal concatenation of matrices and vectors:
+{-- - | Horizontal concatenation of matrices and vectors:
 
 @> (ident 3 \<-\> 3 * ident 3) \<|\> fromList [1..6.0]
 (6><4)
@@ -105,10 +110,10 @@ infixl 3 <->
  , 0.0, 3.0, 0.0, 5.0
  , 0.0, 0.0, 3.0, 6.0 ]@
 -}
-(<|>) :: (Element t, Joinable a b) => a t -> b t -> Matrix t
+-- (<|>) :: (Element t, Joinable a b) => a t -> b t -> Matrix t
 a <|> b = joinH a b
 
--- | Vertical concatenation of matrices and vectors.
-(<->) :: (Element t, Joinable a b) => a t -> b t -> Matrix t
+-- -- | Vertical concatenation of matrices and vectors.
+-- (<->) :: (Element t, Joinable a b) => a t -> b t -> Matrix t
 a <-> b = joinV a b
 
diff --git a/lib/Numeric/LinearAlgebra/Linear.hs b/lib/Numeric/LinearAlgebra/Linear.hs
index 7e23745..2568410 100644
--- a/lib/Numeric/LinearAlgebra/Linear.hs
+++ b/lib/Numeric/LinearAlgebra/Linear.hs
@@ -21,7 +21,7 @@ module Numeric.LinearAlgebra.Linear (
 import Data.Packed
 import Numeric.GSL.Vector
 
--- | A generic interface for vectors and matrices to a few element-by-element functions in Numeric.GSL.Vector.
+-- | Basic element-by-element functions.
 class (Container c e) => Linear c e where
     -- | create a structure with a single element
     scalar      :: e -> c e