dot, mul, app

3 files changed, 27 insertions, 15 deletions

diff --git a/packages/base/src/Data/Packed/Numeric.hs b/packages/base/src/Data/Packed/Numeric.hs
index ab9e8a2..7aa53f1 100644
--- a/packages/base/src/Data/Packed/Numeric.hs
+++ b/packages/base/src/Data/Packed/Numeric.hs
@@ -39,7 +39,7 @@ module Data.Packed.Numeric (
     step, cond, find, assoc, accum,
     Transposable(..), Linear(..),
     -- * Matrix product
-    Product(..), udot, dot, (<·>), (#>),
+    Product(..), udot, dot, (<·>), (#>), app,
     Mul(..),
     (<.>),
     optimiseMult,
@@ -105,7 +105,7 @@ infixl 7 <.>
 
 infixr 8 <·>, #>
 
-{- | dot product
+{- | infix synonym for 'dot'
 
 >>> vector [1,2,3,4] <·> vector [-2,0,1,1]
 5.0
@@ -121,7 +121,7 @@ infixr 8 <·>, #>
 (<·>) = dot
 
 
-{- | dense matrix-vector product
+{- | infix synonym for 'app'
 
 >>> let m = (2><3) [1..]
 >>> m
@@ -138,6 +138,10 @@ fromList [140.0,320.0]
 (#>) :: Numeric t => Matrix t -> Vector t -> Vector t
 (#>) = mXv
 
+-- | dense matrix-vector product
+app :: Numeric t => Matrix t -> Vector t -> Vector t
+app = (#>)
+
 --------------------------------------------------------------------------------
 
 class Mul a b c | a b -> c where
@@ -226,8 +230,8 @@ instance Container Matrix e => Build (Int,Int) (e -> e -> e) Matrix e
 
 --------------------------------------------------------------------------------
 
--- | dot product: @cdot u v = 'udot' ('conj' u) v@
-dot :: (Container Vector t, Product t) => Vector t -> Vector t -> t
+-- @dot u v = 'udot' ('conj' u) v@
+dot :: (Numeric t) => Vector t -> Vector t -> t
 dot u v = udot (conj u) v
 
 --------------------------------------------------------------------------------
diff --git a/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs b/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs
index 54ddd68..d2cae6c 100644
--- a/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs
@@ -45,12 +45,12 @@ module Numeric.LinearAlgebra.HMatrix (
 
     -- * Products
     -- ** dot
-    (<·>),
+    dot, (<·>),
     -- ** matrix-vector
-    (#>), (!#>),
+    app, (#>), (!#>),
     -- ** matrix-matrix
-     (<>),
-    -- | The matrix x matrix product is also implemented in the "Data.Monoid" instance, where
+    mul, (<>),
+    -- | The matrix product is also implemented in the "Data.Monoid" instance, where
     -- single-element matrices (created from numeric literals or using 'scalar')
     -- are used for scaling.
     --
@@ -96,7 +96,6 @@ module Numeric.LinearAlgebra.HMatrix (
 
     -- * SVD
     svd,
-    fullSVD,
     thinSVD,
     compactSVD,
     singularValues,
@@ -153,7 +152,7 @@ import Numeric.LinearAlgebra.Data
 
 import Numeric.Matrix()
 import Numeric.Vector()
-import Data.Packed.Numeric hiding ((<>))
+import Data.Packed.Numeric hiding ((<>), mul)
 import Numeric.LinearAlgebra.Algorithms hiding (linearSolve,Normed,orth)
 import qualified Numeric.LinearAlgebra.Algorithms as A
 import Numeric.LinearAlgebra.Util
@@ -161,7 +160,7 @@ import Numeric.LinearAlgebra.Random
 import Numeric.Sparse((!#>))
 import Numeric.LinearAlgebra.Util.CG
 
-{- | dense matrix product
+{- | infix synonym of 'mul'
 
 >>> let a = (3><5) [1..]
 >>> a
@@ -190,6 +189,11 @@ import Numeric.LinearAlgebra.Util.CG
 (<>) = mXm
 infixr 8 <>
 
+-- | dense matrix product
+mul :: Numeric t => Matrix t -> Matrix t -> Matrix t
+mul = mXm
+
+
 -- | Solve a linear system (for square coefficient matrix and several right-hand sides) using the LU decomposition, returning Nothing for a singular system. For underconstrained or overconstrained systems use 'linearSolveLS' or 'linearSolveSVD'. 
 linearSolve m b = A.mbLinearSolve m b
 
diff --git a/packages/base/src/Numeric/LinearAlgebra/Static.hs b/packages/base/src/Numeric/LinearAlgebra/Static.hs
index 213c42c..cbcd4e2 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Static.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Static.hs
@@ -25,6 +25,8 @@ Stability   :  experimental
 
 Experimental interface with statically checked dimensions.
 
+This module is under active development and the interface is subject to changes.
+
 -}
 
 module Numeric.LinearAlgebra.Static(
@@ -62,9 +64,11 @@ module Numeric.LinearAlgebra.Static(
 
 import GHC.TypeLits
 import Numeric.LinearAlgebra.HMatrix hiding (
-    (<>),(#>),(<·>),Konst(..),diag, disp,(¦),(——),row,col,vector,matrix,linspace,toRows,toColumns,
-    (<\>),fromList,takeDiag,svd,eig,eigSH,eigSH',eigenvalues,eigenvaluesSH,eigenvaluesSH',build,
-    qr,size)
+    (<>),(#>),(<·>),Konst(..),diag, disp,(¦),(——),
+    row,col,vector,matrix,linspace,toRows,toColumns,
+    (<\>),fromList,takeDiag,svd,eig,eigSH,eigSH',
+    eigenvalues,eigenvaluesSH,eigenvaluesSH',build,
+    qr,size,app,mul,dot)
 import qualified Numeric.LinearAlgebra.HMatrix as LA
 import Data.Proxy(Proxy)
 import Numeric.LinearAlgebra.Static.Internal