octave-nkf: src/DLD-FUNCTIONS/conv2.cc annotate

annotate src/DLD-FUNCTIONS/conv2.cc @ 10368:d2849dbcc858

undo unintended changes to conv2 in previous commit

author	John W. Eaton <jwe@octave.org>
date	Sat, 27 Feb 2010 16:15:38 -0500
parents	173e10268080
children	dc8637fd7a76

rev	line source
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	1 /*
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	2
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 7814 diff changeset	3 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
7017 a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe] jwe parents: 7016 diff changeset	4 Andy Adler
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	5
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	7
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	9 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5823 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5823 diff changeset	11 option) any later version.
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	12
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	16 for more details.
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	17
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	18 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5823 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5823 diff changeset	20 <http://www.gnu.org/licenses/>.
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	21
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	22 */
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	23
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	24 #ifdef HAVE_CONFIG_H
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	25 #include <config.h>
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	26 #endif
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	27
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	28 #include "defun-dld.h"
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	29 #include "error.h"
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	30 #include "oct-obj.h"
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	31 #include "utils.h"
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	32
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	33 #define MAX(a,b) ((a) > (b) ? (a) : (b))
d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	34
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	35 enum Shape { SHAPE_FULL, SHAPE_SAME, SHAPE_VALID };
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	36
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	37 #if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	38 extern MArray<double>
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	39 conv2 (MArray<double>&, MArray<double>&, MArray<double>&, Shape);
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	40
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	41 extern MArray<Complex>
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	42 conv2 (MArray<Complex>&, MArray<Complex>&, MArray<Complex>&, Shape);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	43
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	44 extern MArray<float>
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	45 conv2 (MArray<float>&, MArray<float>&, MArray<float>&, Shape);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	46
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	47 extern MArray<FloatComplex>
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	48 conv2 (MArray<FloatComplex>&, MArray<FloatComplex>&, MArray<FloatComplex>&, Shape);
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	49 #endif
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	50
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	51 template <class T>
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	52 MArray<T>
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	53 conv2 (MArray<T>& R, MArray<T>& C, MArray<T>& A, Shape ishape)
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	54 {
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	55 octave_idx_type Rn = R.length ();
d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	56 octave_idx_type Cm = C.length ();
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	57 octave_idx_type Am = A.rows ();
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	58 octave_idx_type An = A.columns ();
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	59
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	60 // Calculate the size of the output matrix:
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	61 // in order to stay Matlab compatible, it is based
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	62 // on the third parameter if it's separable, and the
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	63 // first if it's not
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	64
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	65 octave_idx_type outM = 0;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	66 octave_idx_type outN = 0;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	67 octave_idx_type edgM = 0;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	68 octave_idx_type edgN = 0;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	69
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	70 switch (ishape)
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	71 {
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	72 case SHAPE_FULL:
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	73 outM = Am + Cm - 1;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	74 outN = An + Rn - 1;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	75 edgM = Cm - 1;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	76 edgN = Rn - 1;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	77 break;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	78
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	79 case SHAPE_SAME:
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	80 outM = Am;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	81 outN = An;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	82 // Follow the Matlab convention (ie + instead of -)
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	83 edgM = (Cm - 1) /2;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	84 edgN = (Rn - 1) /2;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	85 break;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	86
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	87 case SHAPE_VALID:
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	88 outM = Am - Cm + 1;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	89 outN = An - Rn + 1;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	90 if (outM < 0)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	91 outM = 0;
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	92 if (outN < 0)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	93 outN = 0;
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	94 edgM = edgN = 0;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	95 break;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	96
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	97 default:
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	98 error ("conv2: invalid value of parameter ishape");
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	99 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	100
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	101 MArray<T> O (outM, outN);
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	102
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	103 // X accumulates the 1-D conv for each row, before calculating
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	104 // the convolution in the other direction
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	105 // There is no efficiency advantage to doing it in either direction
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	106 // first
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	107
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	108 MArray<T> X (An, 1);
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	109
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	110 for (octave_idx_type oi = 0; oi < outM; oi++)
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	111 {
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	112 for (octave_idx_type oj = 0; oj < An; oj++)
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	113 {
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	114 T sum = 0;
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	115
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	116 octave_idx_type ci = Cm - 1 - MAX(0, edgM-oi);
d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	117 octave_idx_type ai = MAX(0, oi-edgM);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	118 const T* Ad = A.data() + ai + Am*oj;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	119 const T* Cd = C.data() + ci;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	120 for ( ; ci >= 0 && ai < Am; ci--, Cd--, ai++, Ad++)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	121 sum += (Ad) (*Cd);
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	122
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	123 X(oj) = sum;
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	124 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	125
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	126 for (octave_idx_type oj = 0; oj < outN; oj++)
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	127 {
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	128 T sum = 0;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	129
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	130 octave_idx_type rj = Rn - 1 - MAX(0, edgN-oj);
d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	131 octave_idx_type aj = MAX(0, oj-edgN) ;
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	132 const T* Xd = X.data() + aj;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	133 const T* Rd = R.data() + rj;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	134
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	135 for ( ; rj >= 0 && aj < An; rj--, Rd--, aj++, Xd++)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	136 sum += (Xd) (*Rd);
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	137
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	138 O(oi,oj)= sum;
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	139 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	140 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	141
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	142 return O;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	143 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	144
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	145 #if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	146 extern MArray<double>
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	147 conv2 (MArray<double>&, MArray<double>&, Shape);
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	148
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	149 extern MArray<Complex>
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	150 conv2 (MArray<Complex>&, MArray<Complex>&, Shape);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	151
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	152 extern MArray<float>
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	153 conv2 (MArray<float>&, MArray<float>&, Shape);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	154
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	155 extern MArray<FloatComplex>
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	156 conv2 (MArray<FloatComplex>&, MArray<FloatComplex>&, Shape);
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	157 #endif
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	158
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	159 template <class T>
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	160 MArray<T>
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	161 conv2 (MArray<T>&A, MArray<T>&B, Shape ishape)
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	162 {
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	163 // Convolution works fastest if we choose the A matrix to be
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	164 // the largest.
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	165
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	166 // Here we calculate the size of the output matrix,
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	167 // in order to stay Matlab compatible, it is based
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	168 // on the third parameter if it's separable, and the
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	169 // first if it's not
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	170
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	171 // NOTE in order to be Matlab compatible, we give argueably
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	172 // wrong sizes for 'valid' if the smallest matrix is first
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	173
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	174 octave_idx_type Am = A.rows ();
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	175 octave_idx_type An = A.columns ();
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	176 octave_idx_type Bm = B.rows ();
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	177 octave_idx_type Bn = B.columns ();
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	178
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	179 octave_idx_type outM = 0;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	180 octave_idx_type outN = 0;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	181 octave_idx_type edgM = 0;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	182 octave_idx_type edgN = 0;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	183
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	184 switch (ishape)
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	185 {
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	186 case SHAPE_FULL:
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	187 outM = Am + Bm - 1;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	188 outN = An + Bn - 1;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	189 edgM = Bm - 1;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	190 edgN = Bn - 1;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	191 break;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	192
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	193 case SHAPE_SAME:
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	194 outM = Am;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	195 outN = An;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	196 edgM = (Bm - 1) /2;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	197 edgN = (Bn - 1) /2;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	198 break;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	199
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	200 case SHAPE_VALID:
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	201 outM = Am - Bm + 1;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	202 outN = An - Bn + 1;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	203 if (outM < 0)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	204 outM = 0;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	205 if (outN < 0)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	206 outN = 0;
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	207 edgM = edgN = 0;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	208 break;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	209 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	210
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	211 MArray<T> O (outM, outN);
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	212
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	213 for (octave_idx_type oi = 0; oi < outM; oi++)
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	214 {
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	215 for (octave_idx_type oj = 0; oj < outN; oj++)
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	216 {
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	217 T sum = 0;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	218
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	219 for (octave_idx_type bj = Bn - 1 - MAX (0, edgN-oj), aj= MAX (0, oj-edgN);
d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	220 bj >= 0 && aj < An; bj--, aj++)
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	221 {
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	222 octave_idx_type bi = Bm - 1 - MAX (0, edgM-oi);
d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	223 octave_idx_type ai = MAX (0, oi-edgM);
d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	224 const T* Ad = A.data () + ai + Am*aj;
d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	225 const T* Bd = B.data () + bi + Bm*bj;
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	226
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	227 for ( ; bi >= 0 && ai < Am; bi--, Bd--, ai++, Ad++)
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	228 {
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	229 sum += (Ad) (*Bd);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	230 // Comment: it seems to be 2.5 x faster than this:
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	231 // sum+= A(ai,aj) * B(bi,bj);
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	232 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	233 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	234
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	235 O(oi,oj) = sum;
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	236 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	237 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	238
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	239 return O;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	240 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	241
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	242 /*
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	243 %!test
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	244 %! b = [0,1,2,3;1,8,12,12;4,20,24,21;7,22,25,18];
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	245 %! assert(conv2([0,1;1,2],[1,2,3;4,5,6;7,8,9]),b);
7814 87865ed7405f Second set of single precision test code and fix of resulting bugs David Bateman <dbateman@free.fr> parents: 7789 diff changeset	246
87865ed7405f Second set of single precision test code and fix of resulting bugs David Bateman <dbateman@free.fr> parents: 7789 diff changeset	247 %!test
87865ed7405f Second set of single precision test code and fix of resulting bugs David Bateman <dbateman@free.fr> parents: 7789 diff changeset	248 %! b = single([0,1,2,3;1,8,12,12;4,20,24,21;7,22,25,18]);
87865ed7405f Second set of single precision test code and fix of resulting bugs David Bateman <dbateman@free.fr> parents: 7789 diff changeset	249 %! assert(conv2(single([0,1;1,2]),single([1,2,3;4,5,6;7,8,9])),b);
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	250 */
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	251
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	252 DEFUN_DLD (conv2, args, ,
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	253 "-- texinfo --\n\
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	254 @deftypefn {Loadable Function} {y =} conv2 (@var{a}, @var{b}, @var{shape})\n\
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	255 @deftypefnx {Loadable Function} {y =} conv2 (@var{v1}, @var{v2}, @var{M}, @var{shape})\n\
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	256 \n\
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	257 Returns 2D convolution of @var{a} and @var{b} where the size\n\
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	258 of @var{c} is given by\n\
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	259 \n\
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	260 @table @asis\n\
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	261 @item @var{shape}= 'full'\n\
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	262 returns full 2-D convolution\n\
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	263 @item @var{shape}= 'same'\n\
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	264 same size as a. 'central' part of convolution\n\
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	265 @item @var{shape}= 'valid'\n\
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	266 only parts which do not include zero-padded edges\n\
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	267 @end table\n\
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	268 \n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	269 By default @var{shape} is 'full'. When the third argument is a matrix\n\
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	270 returns the convolution of the matrix @var{M} by the vector @var{v1}\n\
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	271 in the column direction and by vector @var{v2} in the row direction\n\
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	272 @end deftypefn")
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	273 {
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	274 octave_value retval;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	275 octave_value tmp;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	276 int nargin = args.length ();
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	277 std::string shape= "full"; //default
d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	278 bool separable= false;
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	279 Shape ishape;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	280
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	281 if (nargin < 2)
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	282 {
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5822 diff changeset	283 print_usage ();
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	284 return retval;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	285 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	286 else if (nargin == 3)
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	287 {
5822 4fdc2515ebad [project @ 2006-05-18 19:31:36 by jwe] jwe parents: 5819 diff changeset	288 if (args(2).is_string ())
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	289 shape = args(2).string_value ();
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	290 else
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	291 separable = true;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	292 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	293 else if (nargin >= 4)
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	294 {
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	295 separable = true;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	296 shape = args(3).string_value ();
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	297 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	298
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	299 if (shape == "full")
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	300 ishape = SHAPE_FULL;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	301 else if (shape == "same")
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	302 ishape = SHAPE_SAME;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	303 else if (shape == "valid")
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	304 ishape = SHAPE_VALID;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	305 else
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	306 {
5822 4fdc2515ebad [project @ 2006-05-18 19:31:36 by jwe] jwe parents: 5819 diff changeset	307 error ("conv2: shape type not valid");
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5822 diff changeset	308 print_usage ();
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	309 return retval;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	310 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	311
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	312 if (separable)
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	313 {
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	314 // If user requests separable, check first two params are vectors
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	315
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	316 if (! (1 == args(0).rows () \|\| 1 == args(0).columns ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	317 \|\| ! (1 == args(1).rows () \|\| 1 == args(1).columns ()))
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	318 {
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	319 print_usage ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	320 return retval;
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	321 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	322
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	323 if (args(0).is_single_type () \|\|
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	324 args(1).is_single_type () \|\|
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	325 args(2).is_single_type ())
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	326 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	327 if (args(0).is_complex_type ()
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	328 \|\| args(1).is_complex_type ()
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	329 \|\| args(2).is_complex_type ())
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	330 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	331 FloatComplexColumnVector v1 (args(0).float_complex_vector_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	332 FloatComplexColumnVector v2 (args(1).float_complex_vector_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	333 FloatComplexMatrix a (args(2).float_complex_matrix_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	334 FloatComplexMatrix c (conv2 (v1, v2, a, ishape));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	335 if (! error_state)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	336 retval = c;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	337 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	338 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	339 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	340 FloatColumnVector v1 (args(0).float_vector_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	341 FloatColumnVector v2 (args(1).float_vector_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	342 FloatMatrix a (args(2).float_matrix_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	343 FloatMatrix c (conv2 (v1, v2, a, ishape));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	344 if (! error_state)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	345 retval = c;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	346 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	347 }
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	348 else
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	349 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	350 if (args(0).is_complex_type ()
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	351 \|\| args(1).is_complex_type ()
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	352 \|\| args(2).is_complex_type ())
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	353 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	354 ComplexColumnVector v1 (args(0).complex_vector_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	355 ComplexColumnVector v2 (args(1).complex_vector_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	356 ComplexMatrix a (args(2).complex_matrix_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	357 ComplexMatrix c (conv2 (v1, v2, a, ishape));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	358 if (! error_state)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	359 retval = c;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	360 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	361 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	362 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	363 ColumnVector v1 (args(0).vector_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	364 ColumnVector v2 (args(1).vector_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	365 Matrix a (args(2).matrix_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	366 Matrix c (conv2 (v1, v2, a, ishape));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	367 if (! error_state)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	368 retval = c;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	369 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	370 }
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	371 } // if (separable)
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	372 else
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	373 {
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	374 if (args(0).is_single_type () \|\|
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	375 args(1).is_single_type ())
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	376 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	377 if (args(0).is_complex_type ()
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	378 \|\| args(1).is_complex_type ())
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	379 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	380 FloatComplexMatrix a (args(0).float_complex_matrix_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	381 FloatComplexMatrix b (args(1).float_complex_matrix_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	382 FloatComplexMatrix c (conv2 (a, b, ishape));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	383 if (! error_state)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	384 retval = c;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	385 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	386 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	387 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	388 FloatMatrix a (args(0).float_matrix_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	389 FloatMatrix b (args(1).float_matrix_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	390 FloatMatrix c (conv2 (a, b, ishape));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	391 if (! error_state)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	392 retval = c;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	393 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	394 }
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	395 else
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	396 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	397 if (args(0).is_complex_type ()
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	398 \|\| args(1).is_complex_type ())
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	399 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	400 ComplexMatrix a (args(0).complex_matrix_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	401 ComplexMatrix b (args(1).complex_matrix_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	402 ComplexMatrix c (conv2 (a, b, ishape));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	403 if (! error_state)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	404 retval = c;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	405 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	406 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	407 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	408 Matrix a (args(0).matrix_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	409 Matrix b (args(1).matrix_value ());
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	410 Matrix c (conv2 (a, b, ishape));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	411 if (! error_state)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	412 retval = c;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	413 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	414 }
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	415
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	416 } // if (separable)
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	417
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	418 return retval;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	419 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	420
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	421 template MArray<double>
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	422 conv2 (MArray<double>&, MArray<double>&, MArray<double>&, Shape);
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	423
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	424 template MArray<double>
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	425 conv2 (MArray<double>&, MArray<double>&, Shape);
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	426
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	427 template MArray<Complex>
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	428 conv2 (MArray<Complex>&, MArray<Complex>&, MArray<Complex>&, Shape);
5819 e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe] jwe parents: diff changeset	429
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10155 diff changeset	430 template MArray<Complex>
10368 d2849dbcc858 undo unintended changes to conv2 in previous commit John W. Eaton <jwe@octave.org> parents: 10367 diff changeset	431 conv2 (MArray<Complex>&, MArray<Complex>&, Shape);

Mercurial > octave-nkf

annotate src/DLD-FUNCTIONS/conv2.cc @ 10368:d2849dbcc858