cdot and (×)

added cdot
dot renamed to udot
<.> changed to cdot and moved to Numeric.LinearAlgebra.Util
new general contraction operator (×)
Plot functions moved to Numeric.LinearAlgebra.Util

2 files changed, 17 insertions, 9 deletions

diff --git a/lib/Numeric/LinearAlgebra/Util.hs b/lib/Numeric/LinearAlgebra/Util.hs
index f7c40d7..f6aa7da 100644
--- a/lib/Numeric/LinearAlgebra/Util.hs
+++ b/lib/Numeric/LinearAlgebra/Util.hs
@@ -19,10 +19,11 @@ module Numeric.LinearAlgebra.Util(
     diagl,
     row,
     col,
-    (&),(!), (¦), (#),
-    (?),(¿),
+    (&), (¦), (#),
+    (?), (¿),
     rand, randn,
     cross,
+    (<.>),
     norm,
     unitary,
     mt,
@@ -45,7 +46,13 @@ module Numeric.LinearAlgebra.Util(
     vec,
     vech,
     dup,
-    vtrans
+    vtrans,
+    -- * Plot
+    mplot,
+    plot, parametricPlot,
+    splot, mesh, meshdom,
+    matrixToPGM, imshow,
+    gnuplotX, gnuplotpdf, gnuplotWin
 ) where
 
 import Numeric.Container
@@ -55,6 +62,7 @@ import Numeric.Vector()
 
 import System.Random(randomIO)
 import Numeric.LinearAlgebra.Util.Convolution
+import Graphics.Plot
 
 
 disp :: Int -> Matrix Double -> IO ()
@@ -99,11 +107,6 @@ infixl 3 &
 (&) :: Vector Double -> Vector Double -> Vector Double
 a & b = vjoin [a,b]
 
--- | horizontal concatenation of real matrices
-infixl 3 !
-(!) :: Matrix Double -> Matrix Double -> Matrix Double
-a ! b = fromBlocks [[a,b]]
-
 -- | (00A6) horizontal concatenation of real matrices
 infixl 3 ¦
 (¦) :: Matrix Double -> Matrix Double -> Matrix Double
@@ -161,6 +164,11 @@ size m = (rows m, cols m)
 mt :: Matrix Double -> Matrix Double
 mt = trans . inv
 
+-- | dot product: @u \<.\> v = 'cdot' u v@
+(<.>) :: (Container Vector t, Product t) => Vector t -> Vector t -> t
+infixl 7 <.>
+u <.> v = cdot u v
+
 ----------------------------------------------------------------------
 
 -- | Matrix of pairwise squared distances of row vectors
diff --git a/lib/Numeric/LinearAlgebra/Util/Convolution.hs b/lib/Numeric/LinearAlgebra/Util/Convolution.hs
index be9b1eb..1043614 100644
--- a/lib/Numeric/LinearAlgebra/Util/Convolution.hs
+++ b/lib/Numeric/LinearAlgebra/Util/Convolution.hs
@@ -75,7 +75,7 @@ matSS dr m = map (reshape c) [ subVector (k*c) n v | k <- [0 .. r - dr] ]
 corr2 :: Product a => Matrix a -> Matrix a -> Matrix a
 -- ^ 2D correlation
 corr2 ker mat = dims
-              . concatMap (map ((<.> ker') . flatten) . matSS c . trans)
+              . concatMap (map (udot ker' . flatten) . matSS c . trans)
               . matSS r $ mat
   where
     r = rows ker