diff options
| author | Alberto Ruiz <aruiz@um.es> | 2014-04-24 10:30:01 +0200 |
|---|---|---|
| committer | Alberto Ruiz <aruiz@um.es> | 2014-04-24 10:30:01 +0200 |
| commit | 6fbed842525491e280448a00a4b5426e6830ccaa (patch) | |
| tree | b78d2712f7ac23845fc29120d3a9fbcd7d189004 /lib/Numeric/LinearAlgebra/Util/Convolution.hs | |
| parent | 7c5adb83c9cb632c39eb2d844a1496e2a7a23e8b (diff) | |
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
Diffstat (limited to 'lib/Numeric/LinearAlgebra/Util/Convolution.hs')
| -rw-r--r-- | lib/Numeric/LinearAlgebra/Util/Convolution.hs | 2 |
1 files changed, 1 insertions, 1 deletions
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] ] | |||
| 75 | corr2 :: Product a => Matrix a -> Matrix a -> Matrix a | 75 | corr2 :: Product a => Matrix a -> Matrix a -> Matrix a |
| 76 | -- ^ 2D correlation | 76 | -- ^ 2D correlation |
| 77 | corr2 ker mat = dims | 77 | corr2 ker mat = dims |
| 78 | . concatMap (map ((<.> ker') . flatten) . matSS c . trans) | 78 | . concatMap (map (udot ker' . flatten) . matSS c . trans) |
| 79 | . matSS r $ mat | 79 | . matSS r $ mat |
| 80 | where | 80 | where |
| 81 | r = rows ker | 81 | r = rows ker |