Mercurial > octave
annotate libinterp/corefcn/conv2.cc @ 17787:175b392e91fe
Use GNU style coding conventions for code in libinterp/
* libinterp/corefcn/Cell.h, libinterp/corefcn/__contourc__.cc,
libinterp/corefcn/__dispatch__.cc, libinterp/corefcn/__lin_interpn__.cc,
libinterp/corefcn/__pchip_deriv__.cc, libinterp/corefcn/__qp__.cc,
libinterp/corefcn/balance.cc, libinterp/corefcn/besselj.cc,
libinterp/corefcn/betainc.cc, libinterp/corefcn/bitfcns.cc,
libinterp/corefcn/bsxfun.cc, libinterp/corefcn/c-file-ptr-stream.cc,
libinterp/corefcn/c-file-ptr-stream.h, libinterp/corefcn/cellfun.cc,
libinterp/corefcn/colloc.cc, libinterp/corefcn/comment-list.h,
libinterp/corefcn/conv2.cc, libinterp/corefcn/daspk.cc,
libinterp/corefcn/dasrt.cc, libinterp/corefcn/dassl.cc,
libinterp/corefcn/data.cc, libinterp/corefcn/debug.cc,
libinterp/corefcn/defaults.cc, libinterp/corefcn/defaults.in.h,
libinterp/corefcn/defun-int.h, libinterp/corefcn/defun.cc,
libinterp/corefcn/det.cc, libinterp/corefcn/dirfns.cc,
libinterp/corefcn/display.cc, libinterp/corefcn/dlmread.cc,
libinterp/corefcn/dot.cc, libinterp/corefcn/dynamic-ld.cc,
libinterp/corefcn/dynamic-ld.h, libinterp/corefcn/eig.cc,
libinterp/corefcn/ellipj.cc, libinterp/corefcn/error.cc,
libinterp/corefcn/error.h, libinterp/corefcn/event-queue.h,
libinterp/corefcn/fft.cc, libinterp/corefcn/fft2.cc, libinterp/corefcn/fftn.cc,
libinterp/corefcn/file-io.cc, libinterp/corefcn/filter.cc,
libinterp/corefcn/find.cc, libinterp/corefcn/gammainc.cc,
libinterp/corefcn/gcd.cc, libinterp/corefcn/getgrent.cc,
libinterp/corefcn/getpwent.cc, libinterp/corefcn/getrusage.cc,
libinterp/corefcn/givens.cc, libinterp/corefcn/gl-render.cc,
libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/gl2ps-renderer.h,
libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h,
libinterp/corefcn/gripes.cc, libinterp/corefcn/gripes.h,
libinterp/corefcn/help.cc, libinterp/corefcn/hess.cc,
libinterp/corefcn/hex2num.cc, libinterp/corefcn/input.cc,
libinterp/corefcn/input.h, libinterp/corefcn/inv.cc,
libinterp/corefcn/jit-ir.h, libinterp/corefcn/jit-typeinfo.cc,
libinterp/corefcn/jit-typeinfo.h, libinterp/corefcn/jit-util.h,
libinterp/corefcn/kron.cc, libinterp/corefcn/load-path.cc,
libinterp/corefcn/load-path.h, libinterp/corefcn/load-save.cc,
libinterp/corefcn/load-save.h, libinterp/corefcn/lookup.cc,
libinterp/corefcn/ls-ascii-helper.cc, libinterp/corefcn/ls-hdf5.cc,
libinterp/corefcn/ls-hdf5.h, libinterp/corefcn/ls-mat-ascii.cc,
libinterp/corefcn/ls-mat-ascii.h, libinterp/corefcn/ls-mat4.cc,
libinterp/corefcn/ls-mat5.cc, libinterp/corefcn/ls-mat5.h,
libinterp/corefcn/ls-oct-ascii.cc, libinterp/corefcn/lsode.cc,
libinterp/corefcn/lu.cc, libinterp/corefcn/luinc.cc,
libinterp/corefcn/mappers.cc, libinterp/corefcn/matrix_type.cc,
libinterp/corefcn/max.cc, libinterp/corefcn/md5sum.cc,
libinterp/corefcn/mex.cc, libinterp/corefcn/mexproto.h,
libinterp/corefcn/mgorth.cc, libinterp/corefcn/mxarray.in.h,
libinterp/corefcn/nproc.cc, libinterp/corefcn/oct-hist.cc,
libinterp/corefcn/oct-lvalue.h, libinterp/corefcn/oct-map.cc,
libinterp/corefcn/oct-map.h, libinterp/corefcn/oct-obj.h,
libinterp/corefcn/oct-prcstrm.h, libinterp/corefcn/oct-stdstrm.h,
libinterp/corefcn/oct-stream.cc, libinterp/corefcn/oct-stream.h,
libinterp/corefcn/octave-link.cc, libinterp/corefcn/octave-link.h,
libinterp/corefcn/pager.cc, libinterp/corefcn/pinv.cc,
libinterp/corefcn/pr-output.cc, libinterp/corefcn/procstream.h,
libinterp/corefcn/profiler.cc, libinterp/corefcn/pt-jit.cc,
libinterp/corefcn/pt-jit.h, libinterp/corefcn/quad.cc,
libinterp/corefcn/quadcc.cc, libinterp/corefcn/qz.cc,
libinterp/corefcn/rand.cc, libinterp/corefcn/rcond.cc,
libinterp/corefcn/regexp.cc, libinterp/corefcn/schur.cc,
libinterp/corefcn/sighandlers.cc, libinterp/corefcn/sighandlers.h,
libinterp/corefcn/sparse-xdiv.cc, libinterp/corefcn/sparse-xdiv.h,
libinterp/corefcn/sparse-xpow.cc, libinterp/corefcn/sparse.cc,
libinterp/corefcn/spparms.cc, libinterp/corefcn/sqrtm.cc,
libinterp/corefcn/str2double.cc, libinterp/corefcn/strfind.cc,
libinterp/corefcn/strfns.cc, libinterp/corefcn/sub2ind.cc,
libinterp/corefcn/svd.cc, libinterp/corefcn/syl.cc,
libinterp/corefcn/symtab.cc, libinterp/corefcn/symtab.h,
libinterp/corefcn/syscalls.cc, libinterp/corefcn/sysdep.cc,
libinterp/corefcn/sysdep.h, libinterp/corefcn/time.cc,
libinterp/corefcn/toplev.cc, libinterp/corefcn/toplev.h,
libinterp/corefcn/tril.cc, libinterp/corefcn/txt-eng-ft.cc,
libinterp/corefcn/txt-eng-ft.h, libinterp/corefcn/txt-eng.h,
libinterp/corefcn/typecast.cc, libinterp/corefcn/urlwrite.cc,
libinterp/corefcn/utils.cc, libinterp/corefcn/variables.cc,
libinterp/corefcn/variables.h, libinterp/corefcn/xdiv.cc,
libinterp/corefcn/xdiv.h, libinterp/corefcn/xnorm.h, libinterp/corefcn/xpow.cc,
libinterp/corefcn/xpow.h, libinterp/corefcn/zfstream.cc,
libinterp/corefcn/zfstream.h, libinterp/dldfcn/__delaunayn__.cc,
libinterp/dldfcn/__dsearchn__.cc, libinterp/dldfcn/__eigs__.cc,
libinterp/dldfcn/__fltk_uigetfile__.cc, libinterp/dldfcn/__glpk__.cc,
libinterp/dldfcn/__init_fltk__.cc, libinterp/dldfcn/__init_gnuplot__.cc,
libinterp/dldfcn/__magick_read__.cc, libinterp/dldfcn/__voronoi__.cc,
libinterp/dldfcn/amd.cc, libinterp/dldfcn/ccolamd.cc, libinterp/dldfcn/chol.cc,
libinterp/dldfcn/colamd.cc, libinterp/dldfcn/convhulln.cc,
libinterp/dldfcn/dmperm.cc, libinterp/dldfcn/fftw.cc, libinterp/dldfcn/qr.cc,
libinterp/dldfcn/symbfact.cc, libinterp/dldfcn/symrcm.cc,
libinterp/dldfcn/tsearch.cc, libinterp/octave-value/ov-base-diag.cc,
libinterp/octave-value/ov-base-diag.h, libinterp/octave-value/ov-base-int.cc,
libinterp/octave-value/ov-base-int.h, libinterp/octave-value/ov-base-mat.h,
libinterp/octave-value/ov-base-scalar.cc,
libinterp/octave-value/ov-base-scalar.h,
libinterp/octave-value/ov-base-sparse.cc,
libinterp/octave-value/ov-base-sparse.h, libinterp/octave-value/ov-base.cc,
libinterp/octave-value/ov-base.h, libinterp/octave-value/ov-bool-mat.cc,
libinterp/octave-value/ov-bool-mat.h, libinterp/octave-value/ov-bool-sparse.cc,
libinterp/octave-value/ov-bool-sparse.h, libinterp/octave-value/ov-bool.cc,
libinterp/octave-value/ov-bool.h, libinterp/octave-value/ov-builtin.cc,
libinterp/octave-value/ov-builtin.h, libinterp/octave-value/ov-cell.cc,
libinterp/octave-value/ov-cell.h, libinterp/octave-value/ov-ch-mat.cc,
libinterp/octave-value/ov-ch-mat.h, libinterp/octave-value/ov-class.cc,
libinterp/octave-value/ov-class.h, libinterp/octave-value/ov-colon.h,
libinterp/octave-value/ov-complex.cc, libinterp/octave-value/ov-complex.h,
libinterp/octave-value/ov-cx-diag.cc, libinterp/octave-value/ov-cx-diag.h,
libinterp/octave-value/ov-cx-mat.cc, libinterp/octave-value/ov-cx-mat.h,
libinterp/octave-value/ov-cx-sparse.cc, libinterp/octave-value/ov-cx-sparse.h,
libinterp/octave-value/ov-dld-fcn.h, libinterp/octave-value/ov-fcn-handle.cc,
libinterp/octave-value/ov-fcn-handle.h,
libinterp/octave-value/ov-fcn-inline.cc,
libinterp/octave-value/ov-fcn-inline.h, libinterp/octave-value/ov-fcn.h,
libinterp/octave-value/ov-float.cc, libinterp/octave-value/ov-float.h,
libinterp/octave-value/ov-flt-complex.cc,
libinterp/octave-value/ov-flt-complex.h,
libinterp/octave-value/ov-flt-cx-diag.cc,
libinterp/octave-value/ov-flt-cx-diag.h,
libinterp/octave-value/ov-flt-cx-mat.cc,
libinterp/octave-value/ov-flt-cx-mat.h,
libinterp/octave-value/ov-flt-re-diag.cc,
libinterp/octave-value/ov-flt-re-diag.h,
libinterp/octave-value/ov-flt-re-mat.cc,
libinterp/octave-value/ov-flt-re-mat.h, libinterp/octave-value/ov-int16.cc,
libinterp/octave-value/ov-int32.cc, libinterp/octave-value/ov-int64.cc,
libinterp/octave-value/ov-int8.cc, libinterp/octave-value/ov-intx.h,
libinterp/octave-value/ov-java.cc, libinterp/octave-value/ov-lazy-idx.h,
libinterp/octave-value/ov-mex-fcn.cc, libinterp/octave-value/ov-mex-fcn.h,
libinterp/octave-value/ov-null-mat.cc, libinterp/octave-value/ov-null-mat.h,
libinterp/octave-value/ov-oncleanup.cc, libinterp/octave-value/ov-perm.cc,
libinterp/octave-value/ov-perm.h, libinterp/octave-value/ov-range.cc,
libinterp/octave-value/ov-range.h, libinterp/octave-value/ov-re-diag.cc,
libinterp/octave-value/ov-re-diag.h, libinterp/octave-value/ov-re-mat.cc,
libinterp/octave-value/ov-re-mat.h, libinterp/octave-value/ov-re-sparse.cc,
libinterp/octave-value/ov-re-sparse.h, libinterp/octave-value/ov-scalar.cc,
libinterp/octave-value/ov-scalar.h, libinterp/octave-value/ov-str-mat.cc,
libinterp/octave-value/ov-str-mat.h, libinterp/octave-value/ov-struct.cc,
libinterp/octave-value/ov-struct.h, libinterp/octave-value/ov-type-conv.h,
libinterp/octave-value/ov-typeinfo.cc, libinterp/octave-value/ov-typeinfo.h,
libinterp/octave-value/ov-uint16.cc, libinterp/octave-value/ov-uint32.cc,
libinterp/octave-value/ov-uint64.cc, libinterp/octave-value/ov-uint8.cc,
libinterp/octave-value/ov-usr-fcn.cc, libinterp/octave-value/ov-usr-fcn.h,
libinterp/octave-value/ov.cc, libinterp/octave-value/ov.h, libinterp/octave.cc,
libinterp/operators/op-b-bm.cc, libinterp/operators/op-b-sbm.cc,
libinterp/operators/op-bm-b.cc, libinterp/operators/op-bm-bm.cc,
libinterp/operators/op-cdm-cdm.cc, libinterp/operators/op-chm.cc,
libinterp/operators/op-class.cc, libinterp/operators/op-cm-cm.cc,
libinterp/operators/op-cm-cs.cc, libinterp/operators/op-cm-s.cc,
libinterp/operators/op-cm-scm.cc, libinterp/operators/op-cm-sm.cc,
libinterp/operators/op-cs-cm.cc, libinterp/operators/op-cs-cs.cc,
libinterp/operators/op-cs-scm.cc, libinterp/operators/op-cs-sm.cc,
libinterp/operators/op-dm-dm.cc, libinterp/operators/op-dm-scm.cc,
libinterp/operators/op-double-conv.cc, libinterp/operators/op-fcdm-fcdm.cc,
libinterp/operators/op-fcm-fcm.cc, libinterp/operators/op-fcm-fcs.cc,
libinterp/operators/op-fcm-fm.cc, libinterp/operators/op-fcm-fs.cc,
libinterp/operators/op-fcs-fcm.cc, libinterp/operators/op-fcs-fcs.cc,
libinterp/operators/op-fcs-fm.cc, libinterp/operators/op-fcs-fs.cc,
libinterp/operators/op-fdm-fdm.cc, libinterp/operators/op-float-conv.cc,
libinterp/operators/op-fm-fcm.cc, libinterp/operators/op-fm-fcs.cc,
libinterp/operators/op-fm-fm.cc, libinterp/operators/op-fm-fs.cc,
libinterp/operators/op-fs-fcm.cc, libinterp/operators/op-fs-fcs.cc,
libinterp/operators/op-fs-fm.cc, libinterp/operators/op-fs-fs.cc,
libinterp/operators/op-m-cm.cc, libinterp/operators/op-m-cs.cc,
libinterp/operators/op-m-m.cc, libinterp/operators/op-m-s.cc,
libinterp/operators/op-m-scm.cc, libinterp/operators/op-m-sm.cc,
libinterp/operators/op-pm-scm.cc, libinterp/operators/op-range.cc,
libinterp/operators/op-s-cm.cc, libinterp/operators/op-s-cs.cc,
libinterp/operators/op-s-scm.cc, libinterp/operators/op-sbm-b.cc,
libinterp/operators/op-sbm-bm.cc, libinterp/operators/op-sbm-sbm.cc,
libinterp/operators/op-scm-cm.cc, libinterp/operators/op-scm-cs.cc,
libinterp/operators/op-scm-m.cc, libinterp/operators/op-scm-s.cc,
libinterp/operators/op-scm-scm.cc, libinterp/operators/op-scm-sm.cc,
libinterp/operators/op-sm-cm.cc, libinterp/operators/op-sm-m.cc,
libinterp/operators/op-sm-s.cc, libinterp/operators/op-sm-scm.cc,
libinterp/operators/op-sm-sm.cc, libinterp/operators/op-str-m.cc,
libinterp/operators/op-str-s.cc, libinterp/operators/op-str-str.cc,
libinterp/operators/ops.h, libinterp/parse-tree/lex.h,
libinterp/parse-tree/parse.h, libinterp/parse-tree/pt-arg-list.cc,
libinterp/parse-tree/pt-arg-list.h, libinterp/parse-tree/pt-assign.cc,
libinterp/parse-tree/pt-assign.h, libinterp/parse-tree/pt-binop.cc,
libinterp/parse-tree/pt-binop.h, libinterp/parse-tree/pt-bp.h,
libinterp/parse-tree/pt-cbinop.cc, libinterp/parse-tree/pt-check.cc,
libinterp/parse-tree/pt-colon.cc, libinterp/parse-tree/pt-colon.h,
libinterp/parse-tree/pt-const.cc, libinterp/parse-tree/pt-decl.cc,
libinterp/parse-tree/pt-decl.h, libinterp/parse-tree/pt-eval.cc,
libinterp/parse-tree/pt-except.h, libinterp/parse-tree/pt-exp.h,
libinterp/parse-tree/pt-fcn-handle.cc, libinterp/parse-tree/pt-id.cc,
libinterp/parse-tree/pt-id.h, libinterp/parse-tree/pt-idx.cc,
libinterp/parse-tree/pt-idx.h, libinterp/parse-tree/pt-loop.h,
libinterp/parse-tree/pt-mat.cc, libinterp/parse-tree/pt-misc.cc,
libinterp/parse-tree/pt-misc.h, libinterp/parse-tree/pt-pr-code.cc,
libinterp/parse-tree/pt-select.h, libinterp/parse-tree/pt-stmt.h,
libinterp/parse-tree/token.h, libinterp/version.cc:
Use GNU style coding conventions for code in libinterp/
author | Rik <rik@octave.org> |
---|---|
date | Mon, 28 Oct 2013 19:51:46 -0700 |
parents | d63878346099 |
children | 7957aedf0b2d |
rev | line source |
---|---|
5819 | 1 /* |
2 | |
17744
d63878346099
maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents:
17704
diff
changeset
|
3 Copyright (C) 1999-2013 Andy Adler |
10498
8615b55b5caf
fix & improve cat (bug #29465)
Jaroslav Hajek <highegg@gmail.com>
parents:
10384
diff
changeset
|
4 Copyright (C) 2010 VZLU Prague |
5819 | 5 |
6 This file is part of Octave. | |
7 | |
8 Octave is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
11 option) any later version. | |
5819 | 12 |
13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
7016 | 19 along with Octave; see the file COPYING. If not, see |
20 <http://www.gnu.org/licenses/>. | |
5819 | 21 |
22 */ | |
23 | |
24 #ifdef HAVE_CONFIG_H | |
25 #include <config.h> | |
26 #endif | |
27 | |
10384
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
28 #include "oct-convn.h" |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
29 |
15039
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14607
diff
changeset
|
30 #include "defun.h" |
5819 | 31 #include "error.h" |
32 #include "oct-obj.h" | |
33 #include "utils.h" | |
34 | |
35 enum Shape { SHAPE_FULL, SHAPE_SAME, SHAPE_VALID }; | |
36 | |
15039
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14607
diff
changeset
|
37 DEFUN (conv2, args, , |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
38 "-*- texinfo -*-\n\ |
15039
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14607
diff
changeset
|
39 @deftypefn {Built-in Function} {} conv2 (@var{A}, @var{B})\n\ |
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14607
diff
changeset
|
40 @deftypefnx {Built-in Function} {} conv2 (@var{v1}, @var{v2}, @var{m})\n\ |
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14607
diff
changeset
|
41 @deftypefnx {Built-in Function} {} conv2 (@dots{}, @var{shape})\n\ |
11553
01f703952eff
Improve docstrings for functions in DLD-FUNCTIONS directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
42 Return the 2-D convolution of @var{A} and @var{B}. The size of the result\n\ |
11085
2beacd515e09
Update docstrings for convolution family of functions (conv, conv2, fftconv)
Rik <octave@nomad.inbox5.com>
parents:
11083
diff
changeset
|
43 is determined by the optional @var{shape} argument which takes the following\n\ |
2beacd515e09
Update docstrings for convolution family of functions (conv, conv2, fftconv)
Rik <octave@nomad.inbox5.com>
parents:
11083
diff
changeset
|
44 values\n\ |
5819 | 45 \n\ |
46 @table @asis\n\ | |
17281
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
15241
diff
changeset
|
47 @item @var{shape} = @qcode{\"full\"}\n\ |
11085
2beacd515e09
Update docstrings for convolution family of functions (conv, conv2, fftconv)
Rik <octave@nomad.inbox5.com>
parents:
11083
diff
changeset
|
48 Return the full convolution. (default)\n\ |
10840 | 49 \n\ |
17281
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
15241
diff
changeset
|
50 @item @var{shape} = @qcode{\"same\"}\n\ |
11553
01f703952eff
Improve docstrings for functions in DLD-FUNCTIONS directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
51 Return the central part of the convolution with the same size as @var{A}.\n\ |
14209
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
52 The central part of the convolution begins at the indices\n\ |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
53 @code{floor ([size(@var{B})/2] + 1)}.\n\ |
10840 | 54 \n\ |
17281
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
15241
diff
changeset
|
55 @item @var{shape} = @qcode{\"valid\"}\n\ |
11083
bb8bf77f2242
conv2.cc: style fixes; update docstrings
John W. Eaton <jwe@octave.org>
parents:
10840
diff
changeset
|
56 Return only the parts which do not include zero-padded edges.\n\ |
14209
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
57 The size of the result is @code{max (size (A) - size (B) + 1, 0)}.\n\ |
5819 | 58 @end table\n\ |
59 \n\ | |
11553
01f703952eff
Improve docstrings for functions in DLD-FUNCTIONS directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
60 When the third argument is a matrix, return the convolution of the matrix\n\ |
01f703952eff
Improve docstrings for functions in DLD-FUNCTIONS directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
61 @var{m} by the vector @var{v1} in the column direction and by the vector\n\ |
14209
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
62 @var{v2} in the row direction.\n\ |
11553
01f703952eff
Improve docstrings for functions in DLD-FUNCTIONS directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
63 @seealso{conv, convn}\n\ |
5819 | 64 @end deftypefn") |
65 { | |
66 octave_value retval; | |
67 octave_value tmp; | |
68 int nargin = args.length (); | |
14209
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
69 std::string shape = "full"; // default |
10371 | 70 bool separable = false; |
10384
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
71 convn_type ct; |
5819 | 72 |
73 if (nargin < 2) | |
74 { | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
75 print_usage (); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
76 return retval; |
5819 | 77 } |
78 else if (nargin == 3) | |
79 { | |
5822 | 80 if (args(2).is_string ()) |
5819 | 81 shape = args(2).string_value (); |
82 else | |
83 separable = true; | |
84 } | |
85 else if (nargin >= 4) | |
86 { | |
87 separable = true; | |
88 shape = args(3).string_value (); | |
89 } | |
90 | |
15241
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
91 if (args(0).ndims () > 2 || args(1).ndims () > 2) |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
92 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
93 error ("conv2: A and B must be 1-D vectors or 2-D matrices"); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
94 return retval; |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
95 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
96 |
5819 | 97 if (shape == "full") |
10384
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
98 ct = convn_full; |
5819 | 99 else if (shape == "same") |
10384
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
100 ct = convn_same; |
5819 | 101 else if (shape == "valid") |
10384
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
102 ct = convn_valid; |
5819 | 103 else |
104 { | |
11553
01f703952eff
Improve docstrings for functions in DLD-FUNCTIONS directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
105 error ("conv2: SHAPE type not valid"); |
5823 | 106 print_usage (); |
5819 | 107 return retval; |
108 } | |
109 | |
15241
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
110 if (separable) |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
111 { |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
112 // If user requests separable, check first two params are vectors |
5819 | 113 |
15241
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
114 if (! (1 == args(0).rows () || 1 == args(0).columns ()) |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
115 || ! (1 == args(1).rows () || 1 == args(1).columns ())) |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
116 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
117 print_usage (); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
118 return retval; |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
119 } |
5819 | 120 |
15241
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
121 if (args(0).is_single_type () || args(1).is_single_type () |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
122 || args(2).is_single_type ()) |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
123 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
124 if (args(0).is_complex_type () || args(1).is_complex_type () |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
125 || args(2).is_complex_type ()) |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
126 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
127 FloatComplexMatrix a (args(2).float_complex_matrix_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
128 if (args(1).is_real_type () && args(2).is_real_type ()) |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
129 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
130 FloatColumnVector v1 (args(0).float_vector_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
131 FloatRowVector v2 (args(1).float_vector_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
132 retval = convn (a, v1, v2, ct); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
133 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
134 else |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
135 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
136 FloatComplexColumnVector v1 (args(0).float_complex_vector_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
137 FloatComplexRowVector v2 (args(1).float_complex_vector_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
138 retval = convn (a, v1, v2, ct); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
139 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
140 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
141 else |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
142 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
143 FloatColumnVector v1 (args(0).float_vector_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
144 FloatRowVector v2 (args(1).float_vector_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
145 FloatMatrix a (args(2).float_matrix_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
146 retval = convn (a, v1, v2, ct); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
147 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
148 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
149 else |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
150 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
151 if (args(0).is_complex_type () || args(1).is_complex_type () |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
152 || args(2).is_complex_type ()) |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
153 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
154 ComplexMatrix a (args(2).complex_matrix_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
155 if (args(1).is_real_type () && args(2).is_real_type ()) |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
156 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
157 ColumnVector v1 (args(0).vector_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
158 RowVector v2 (args(1).vector_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
159 retval = convn (a, v1, v2, ct); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
160 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
161 else |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
162 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
163 ComplexColumnVector v1 (args(0).complex_vector_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
164 ComplexRowVector v2 (args(1).complex_vector_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
165 retval = convn (a, v1, v2, ct); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
166 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
167 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
168 else |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
169 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
170 ColumnVector v1 (args(0).vector_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
171 RowVector v2 (args(1).vector_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
172 Matrix a (args(2).matrix_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
173 retval = convn (a, v1, v2, ct); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
174 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
175 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
176 } // if (separable) |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
177 else |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
178 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
179 if (args(0).is_single_type () || args(1).is_single_type ()) |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
180 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
181 if (args(0).is_complex_type () || args(1).is_complex_type ()) |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
182 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
183 FloatComplexMatrix a (args(0).float_complex_matrix_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
184 if (args(1).is_real_type ()) |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
185 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
186 FloatMatrix b (args(1).float_matrix_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
187 retval = convn (a, b, ct); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
188 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
189 else |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
190 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
191 FloatComplexMatrix b (args(1).float_complex_matrix_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
192 retval = convn (a, b, ct); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
193 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
194 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
195 else |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
196 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
197 FloatMatrix a (args(0).float_matrix_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
198 FloatMatrix b (args(1).float_matrix_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
199 retval = convn (a, b, ct); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
200 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
201 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
202 else |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
203 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
204 if (args(0).is_complex_type () || args(1).is_complex_type ()) |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
205 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
206 ComplexMatrix a (args(0).complex_matrix_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
207 if (args(1).is_real_type ()) |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
208 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
209 Matrix b (args(1).matrix_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
210 retval = convn (a, b, ct); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
211 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
212 else |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
213 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
214 ComplexMatrix b (args(1).complex_matrix_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
215 retval = convn (a, b, ct); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
216 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
217 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
218 else |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
219 { |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
220 Matrix a (args(0).matrix_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
221 Matrix b (args(1).matrix_value ()); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
222 retval = convn (a, b, ct); |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
223 } |
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
224 } |
5819 | 225 |
15241
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
226 } // if (separable) |
5819 | 227 |
15241
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
228 return retval; |
5819 | 229 } |
230 | |
14209
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
231 /* |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
232 %!test |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
233 %! c = [0,1,2,3;1,8,12,12;4,20,24,21;7,22,25,18]; |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
234 %! assert (conv2 ([0,1;1,2], [1,2,3;4,5,6;7,8,9]), c); |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
235 |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
236 %!test |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
237 %! c = single ([0,1,2,3;1,8,12,12;4,20,24,21;7,22,25,18]); |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
238 %! assert (conv2 (single ([0,1;1,2]), single ([1,2,3;4,5,6;7,8,9])), c); |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
239 |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
240 %!test |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
241 %! c = [1,4,4;5,18,16;14,48,40;19,62,48;15,48,36]; |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
242 %! assert (conv2 (1:3, 1:2, [1,2;3,4;5,6]), c); |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
243 |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
244 %!assert (conv2 (1:3, 1:2, [1,2;3,4;5,6], "full"), |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
245 %! conv2 (1:3, 1:2, [1,2;3,4;5,6])); |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
246 |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
247 %% Test shapes |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
248 %!shared A, B, C |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
249 %! A = rand (3, 4); |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
250 %! B = rand (4); |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
251 %! C = conv2 (A, B); |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
252 %!assert (conv2 (A,B, "full"), C) |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
253 %!assert (conv2 (A,B, "same"), C(3:5,3:6)) |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
254 %!assert (conv2 (A,B, "valid"), zeros (0, 1)) |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
255 %!assert (size (conv2 (B,A, "valid")), [2 1]) |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
256 |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
257 %!test |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
258 %! B = rand (5); |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
259 %! C = conv2 (A, B); |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
260 %!assert (conv2 (A,B, "full"), C) |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
261 %!assert (conv2 (A,B, "same"), C(3:5,3:6)) |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
262 %!assert (conv2 (A,B, "valid"), zeros (0, 0)) |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
263 %!assert (size (conv2 (B,A, "valid")), [3 2]) |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
264 |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
265 %% Clear shared variables so they are not reported for tests below |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
266 %!shared |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
267 |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
268 %% Test cases from Bug #34893 |
14501
60e5cf354d80
Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions.
Rik <octave@nomad.inbox5.com>
parents:
14209
diff
changeset
|
269 %!assert (conv2 ([1:5;1:5], [1:2], "same"), [4 7 10 13 10; 4 7 10 13 10]) |
60e5cf354d80
Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions.
Rik <octave@nomad.inbox5.com>
parents:
14209
diff
changeset
|
270 %!assert (conv2 ([1:5;1:5]', [1:2]', "same"), [4 7 10 13 10; 4 7 10 13 10]') |
14607
34f067bcac12
maint: Periodic merge of stable to default
Jordi Gutiérrez Hermoso <jordigh@octave.org>
diff
changeset
|
271 %!assert (conv2 ([1:5;1:5], [1:2], "valid"), [4 7 10 13; 4 7 10 13]) |
14501
60e5cf354d80
Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions.
Rik <octave@nomad.inbox5.com>
parents:
14209
diff
changeset
|
272 %!assert (conv2 ([1:5;1:5]', [1:2]', "valid"), [4 7 10 13; 4 7 10 13]') |
14209
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
273 |
14597
6980b0f35df9
conv2.c: Unmark a test as a known failure (bug #34893)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14596
diff
changeset
|
274 %!test |
14596
ad1d7a53b1ca
perform convolution properly independently of matrix orientation (bug #34893)
Sunghyun Cho <sodomau@gmail.com>
parents:
14209
diff
changeset
|
275 %! rand ("seed", 42); |
ad1d7a53b1ca
perform convolution properly independently of matrix orientation (bug #34893)
Sunghyun Cho <sodomau@gmail.com>
parents:
14209
diff
changeset
|
276 %! x = rand (100); |
ad1d7a53b1ca
perform convolution properly independently of matrix orientation (bug #34893)
Sunghyun Cho <sodomau@gmail.com>
parents:
14209
diff
changeset
|
277 %! y = ones (5); |
ad1d7a53b1ca
perform convolution properly independently of matrix orientation (bug #34893)
Sunghyun Cho <sodomau@gmail.com>
parents:
14209
diff
changeset
|
278 %! A = conv2 (x, y)(5:end-4,5:end-4); |
ad1d7a53b1ca
perform convolution properly independently of matrix orientation (bug #34893)
Sunghyun Cho <sodomau@gmail.com>
parents:
14209
diff
changeset
|
279 %! B = conv2 (x, y, "valid"); |
17336
b81b9d079515
Use '##' for comments which stand alone on a line.
Rik <rik@octave.org>
parents:
17281
diff
changeset
|
280 %! assert (B, A); # Yes, this test is for *exact* equivalence. |
14596
ad1d7a53b1ca
perform convolution properly independently of matrix orientation (bug #34893)
Sunghyun Cho <sodomau@gmail.com>
parents:
14209
diff
changeset
|
281 |
ad1d7a53b1ca
perform convolution properly independently of matrix orientation (bug #34893)
Sunghyun Cho <sodomau@gmail.com>
parents:
14209
diff
changeset
|
282 |
14209
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
283 %% Test input validation |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
284 %!error conv2 () |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
285 %!error conv2 (1) |
15241
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
286 %!error <must be 1-D vectors or 2-D matrices> conv2 (ones (2), ones (2,2,2)) |
14209
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
287 %!error <SHAPE type not valid> conv2 (1,2, "NOT_A_SHAPE") |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
288 %% Test alternate calling form which should be 2 vectors and a matrix |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
289 %!error conv2 (ones (2), 1, 1) |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
290 %!error conv2 (1, ones (2), 1) |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
291 */ |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
292 |
15039
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14607
diff
changeset
|
293 DEFUN (convn, args, , |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
294 "-*- texinfo -*-\n\ |
15039
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14607
diff
changeset
|
295 @deftypefn {Built-in Function} {@var{C} =} convn (@var{A}, @var{B})\n\ |
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14607
diff
changeset
|
296 @deftypefnx {Built-in Function} {@var{C} =} convn (@var{A}, @var{B}, @var{shape})\n\ |
14209
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
297 Return the n-D convolution of @var{A} and @var{B}. The size of the result\n\ |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
298 is determined by the optional @var{shape} argument which takes the following\n\ |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
299 values\n\ |
10384
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
300 \n\ |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
301 @table @asis\n\ |
17281
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
15241
diff
changeset
|
302 @item @var{shape} = @qcode{\"full\"}\n\ |
14209
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
303 Return the full convolution. (default)\n\ |
10840 | 304 \n\ |
17281
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
15241
diff
changeset
|
305 @item @var{shape} = @qcode{\"same\"}\n\ |
11553
01f703952eff
Improve docstrings for functions in DLD-FUNCTIONS directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
306 Return central part of the convolution with the same size as @var{A}.\n\ |
14209
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
307 The central part of the convolution begins at the indices\n\ |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
308 @code{floor ([size(@var{B})/2] + 1)}.\n\ |
10840 | 309 \n\ |
17281
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
15241
diff
changeset
|
310 @item @var{shape} = @qcode{\"valid\"}\n\ |
11083
bb8bf77f2242
conv2.cc: style fixes; update docstrings
John W. Eaton <jwe@octave.org>
parents:
10840
diff
changeset
|
311 Return only the parts which do not include zero-padded edges.\n\ |
14209
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
312 The size of the result is @code{max (size (A) - size (B) + 1, 0)}.\n\ |
10384
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
313 @end table\n\ |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
314 \n\ |
11553
01f703952eff
Improve docstrings for functions in DLD-FUNCTIONS directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
315 @seealso{conv2, conv}\n\ |
10384
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
316 @end deftypefn") |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
317 { |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
318 octave_value retval; |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
319 octave_value tmp; |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
320 int nargin = args.length (); |
14209
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
321 std::string shape = "full"; // default |
10384
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
322 convn_type ct; |
5819 | 323 |
10384
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
324 if (nargin < 2 || nargin > 3) |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
325 { |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
326 print_usage (); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
327 return retval; |
10384
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
328 } |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
329 else if (nargin == 3) |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
330 { |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
331 if (args(2).is_string ()) |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
332 shape = args(2).string_value (); |
17695
d6f4b01075e0
convn: give error for non-string shape argument.
Carnë Draug <carandraug@octave.org>
parents:
17336
diff
changeset
|
333 else |
d6f4b01075e0
convn: give error for non-string shape argument.
Carnë Draug <carandraug@octave.org>
parents:
17336
diff
changeset
|
334 { |
d6f4b01075e0
convn: give error for non-string shape argument.
Carnë Draug <carandraug@octave.org>
parents:
17336
diff
changeset
|
335 error ("convn: SHAPE must be a string"); |
d6f4b01075e0
convn: give error for non-string shape argument.
Carnë Draug <carandraug@octave.org>
parents:
17336
diff
changeset
|
336 return retval; |
d6f4b01075e0
convn: give error for non-string shape argument.
Carnë Draug <carandraug@octave.org>
parents:
17336
diff
changeset
|
337 } |
10384
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
338 } |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
339 |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
340 if (shape == "full") |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
341 ct = convn_full; |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
342 else if (shape == "same") |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
343 ct = convn_same; |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
344 else if (shape == "valid") |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
345 ct = convn_valid; |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
346 else |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
347 { |
11553
01f703952eff
Improve docstrings for functions in DLD-FUNCTIONS directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
348 error ("convn: SHAPE type not valid"); |
10384
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
349 print_usage (); |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
350 return retval; |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
351 } |
5819 | 352 |
11083
bb8bf77f2242
conv2.cc: style fixes; update docstrings
John W. Eaton <jwe@octave.org>
parents:
10840
diff
changeset
|
353 if (args(0).is_single_type () || args(1).is_single_type ()) |
10384
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
354 { |
11083
bb8bf77f2242
conv2.cc: style fixes; update docstrings
John W. Eaton <jwe@octave.org>
parents:
10840
diff
changeset
|
355 if (args(0).is_complex_type () || args(1).is_complex_type ()) |
10384
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
356 { |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
357 FloatComplexNDArray a (args(0).float_complex_array_value ()); |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
358 if (args(1).is_real_type ()) |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
359 { |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
360 FloatNDArray b (args(1).float_array_value ()); |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
361 retval = convn (a, b, ct); |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
362 } |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
363 else |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
364 { |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
365 FloatComplexNDArray b (args(1).float_complex_array_value ()); |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
366 retval = convn (a, b, ct); |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
367 } |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
368 } |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
369 else |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
370 { |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
371 FloatNDArray a (args(0).float_array_value ()); |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
372 FloatNDArray b (args(1).float_array_value ()); |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
373 retval = convn (a, b, ct); |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
374 } |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
375 } |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
376 else |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
377 { |
11083
bb8bf77f2242
conv2.cc: style fixes; update docstrings
John W. Eaton <jwe@octave.org>
parents:
10840
diff
changeset
|
378 if (args(0).is_complex_type () || args(1).is_complex_type ()) |
10384
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
379 { |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
380 ComplexNDArray a (args(0).complex_array_value ()); |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
381 if (args(1).is_real_type ()) |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
382 { |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
383 NDArray b (args(1).array_value ()); |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
384 retval = convn (a, b, ct); |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
385 } |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
386 else |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
387 { |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
388 ComplexNDArray b (args(1).complex_array_value ()); |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
389 retval = convn (a, b, ct); |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
390 } |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
391 } |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
392 else |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
393 { |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
394 NDArray a (args(0).array_value ()); |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
395 NDArray b (args(1).array_value ()); |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
396 retval = convn (a, b, ct); |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
397 } |
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
398 } |
5819 | 399 |
15241
2cdace1ba287
Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
400 return retval; |
10384
978f5c94b11f
initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10371
diff
changeset
|
401 } |
14209
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
402 |
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
403 /* |
17696
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
404 ## Check for bug #39314 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
405 %!test |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
406 %! v = reshape ([1 2], [1 1 2]); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
407 %! assert (convn (v, v), reshape ([1 4 4], [1 1 3])); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
408 %! assert (convn (v, v, "same"), reshape ([4 4], [1 1 2])); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
409 %! assert (convn (v, v, "valid"), 4); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
410 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
411 ## The following test may look weird since we are using the output |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
412 ## of convn to test itself. However, because calculations are done |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
413 ## differently based on the shape option, it will help to catch some |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
414 ## bugs. See also bug #39314 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
415 %!shared a, b, c |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
416 %! ## test 3D by 3D |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
417 %! a = rand (10, 10, 10); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
418 %! b = rand (3, 3, 3); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
419 %! c = convn (a, b, "full"); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
420 %!assert (convn (a, b, "same"), c(2:11,2:11,2:11)); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
421 %!assert (convn (a, b, "valid"), c(3:10,3:10,3:10)); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
422 %! |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
423 %! ## test 3D by 2D |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
424 %! a = rand (10, 10, 10); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
425 %! b = rand (3, 3); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
426 %! c = convn (a, b, "full"); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
427 %!assert (convn (a, b, "same"), c(2:11,2:11,:)); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
428 %!assert (convn (a, b, "valid"), c(3:10,3:10,:)); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
429 %! |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
430 %! ## test 2D by 3D |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
431 %! a = rand (10, 10); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
432 %! b = rand (3, 3, 3); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
433 %! c = convn (a, b, "full"); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
434 %!assert (convn (a, b, "same"), c(2:11,2:11,2)); |
17704
7903ae3b657d
convn: fix incorrect tests
Carnë Draug <carandraug@octave.org>
parents:
17696
diff
changeset
|
435 %!assert (convn (a, b, "valid"), c(3:10,3:10,3:2)); # a 7x7x0 matrix |
17696
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
436 %! |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
437 %! ## test multiple different number of dimensions, with odd |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
438 %! ## and even numbers |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
439 %! a = rand (10, 15, 7, 8, 10); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
440 %! b = rand (4, 3, 2, 3); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
441 %! c = convn (a, b, "full"); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
442 %!assert (convn (a, b, "same"), c(3:12,2:16,2:8,2:9,:)) |
17704
7903ae3b657d
convn: fix incorrect tests
Carnë Draug <carandraug@octave.org>
parents:
17696
diff
changeset
|
443 %!assert (convn (a, b, "valid"), c(4:10,3:15,2:7,3:8,:)); |
17696
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
444 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
445 %!shared a, b, c |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
446 %! a = reshape (floor (magic (16) /10), [4 8 4 2]); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
447 %! b = reshape (magic (6), [4 3 3]); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
448 %! c = zeros (7, 10, 6, 2); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
449 %! c(:,:,1,1) = [ |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
450 %! 875 1415 1215 741 288 264 635 1109 687 171 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
451 %! 110 467 1551 1790 1891 1651 1165 900 659 568 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
452 %! 883 1047 1475 1964 2181 2302 2117 1674 579 234 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
453 %! 940 2330 3099 2573 2306 2207 2442 2918 2272 1004 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
454 %! 161 500 1564 2066 2355 2270 2099 1621 1144 831 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
455 %! 644 622 886 1121 1652 1967 1907 1668 529 228 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
456 %! 160 752 1232 768 360 284 668 1132 1380 864]; |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
457 %! c(:,:,2,1) = [ |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
458 %! 150 1174 1903 1971 2030 1719 1467 1420 1220 472 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
459 %! 986 2243 2603 2385 2308 2530 2971 3181 2266 768 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
460 %! 914 2443 3750 3782 3976 3821 3723 3709 2599 1178 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
461 %! 1922 3374 5198 5472 5563 5853 5794 5543 3578 1820 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
462 %! 1060 2471 3846 3724 3682 3803 3812 3927 2876 1390 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
463 %! 470 2078 3283 3225 2701 2265 2165 2261 2324 1124 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
464 %! 700 1130 1486 1515 1830 2097 2081 2028 1009 348]; |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
465 %! c(:,:,3,1) = [ |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
466 %! 1350 2127 2461 2082 1694 1909 2230 2621 1681 683 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
467 %! 877 2473 4362 4556 4543 4314 3879 3703 2863 1497 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
468 %! 1934 4219 5874 6117 5966 6051 5984 5714 3891 1562 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
469 %! 1927 5997 8573 8456 8517 8025 7957 8101 6121 2500 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
470 %! 1558 3533 5595 6064 6453 6491 6275 5743 3794 1832 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
471 %! 1950 2762 3455 3423 4019 4578 4807 4857 2304 907 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
472 %! 525 1860 2731 2392 1872 1724 1961 2312 2315 1141]; |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
473 %! c(:,:,4,1) = [ |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
474 %! 150 1317 2230 2621 2996 2767 2472 2049 1514 583 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
475 %! 1429 3056 3879 3703 3756 3964 4394 4570 3111 1250 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
476 %! 1833 4037 5984 5714 5846 5788 5883 6129 4157 2011 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
477 %! 3143 5469 7957 8101 8063 8475 8564 8439 5306 2538 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
478 %! 2001 4514 6275 5743 5391 5389 5578 6110 4473 1953 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
479 %! 817 3196 4807 4857 4229 3659 3477 3375 3208 1400 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
480 %! 750 1365 1961 2312 2840 2993 2722 2344 1092 323]; |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
481 %! c(:,:,5,1) = [ |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
482 %! 475 734 1296 1352 1400 1595 1557 1517 960 490 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
483 %! 751 1977 2831 2746 2607 2665 2733 2833 2186 912 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
484 %! 1065 3142 4344 4150 3768 3734 3876 4086 3366 1327 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
485 %! 976 3712 5530 5921 6158 5802 5481 5071 3821 1491 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
486 %! 1397 2996 3971 4003 4088 4180 4199 4146 2649 985 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
487 %! 1273 2121 2555 2247 2378 2624 2908 3229 1788 705 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
488 %! 365 1108 1530 1652 1550 1407 1274 1127 889 264]; |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
489 %! c(:,:,6,1) = [ |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
490 %! 0 133 345 683 982 1058 960 623 310 100 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
491 %! 437 806 1313 1332 1383 1391 1397 1370 864 495 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
492 %! 928 1573 2201 1928 1864 1932 2183 2445 1557 855 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
493 %! 1199 2083 2739 2573 2507 2656 2786 2928 1795 736 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
494 %! 912 1997 2404 2028 1692 1591 1803 2159 1603 599 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
495 %! 345 1092 1526 1666 1593 1437 1275 1116 863 253 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
496 %! 50 235 510 811 998 894 615 318 77 0]; |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
497 %! c(:,:,1,2) = [ |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
498 %! 840 1350 1176 697 293 320 674 1153 717 180 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
499 %! 142 490 1563 1824 1929 1604 1132 857 624 587 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
500 %! 890 1084 1539 1979 2238 2333 2072 1610 509 202 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
501 %! 966 2263 3034 2518 2250 2235 2512 2992 2305 1016 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
502 %! 200 561 1607 2107 2361 2277 2030 1548 1102 818 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
503 %! 652 631 922 1128 1670 1997 1895 1665 467 197 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
504 %! 160 744 1192 692 292 256 708 1208 1448 900]; |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
505 %! c(:,:,2,2) = [ |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
506 %! 179 1199 1886 1987 1997 1716 1479 1383 1215 485 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
507 %! 988 2213 2552 2358 2304 2615 3011 3210 2246 744 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
508 %! 921 2483 3747 3768 3960 3835 3712 3698 2588 1183 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
509 %! 1903 3416 5254 5490 5572 5826 5761 5505 3502 1814 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
510 %! 1064 2507 3825 3666 3680 3748 3821 3958 2892 1395 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
511 %! 495 2129 3277 3228 2566 2216 2154 2250 2390 1154 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
512 %! 700 1105 1472 1524 1856 2113 2059 2019 975 325]; |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
513 %! c(:,:,3,2) = [ |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
514 %! 1302 2104 2439 2006 1723 1931 2280 2685 1678 690 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
515 %! 877 2507 4408 4580 4523 4233 3852 3647 2850 1516 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
516 %! 1949 4238 5895 6143 6018 6063 5930 5656 3847 1538 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
517 %! 1953 5975 8547 8433 8407 8060 7955 8069 6170 2506 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
518 %! 1621 3536 5624 6117 6459 6456 6180 5666 3735 1815 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
519 %! 1904 2751 3429 3366 4122 4622 4840 4864 2242 882 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
520 %! 517 1843 2674 2337 1777 1686 2005 2367 2385 1175]; |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
521 %! c(:,:,4,2) = [ |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
522 %! 198 1346 2280 2685 2980 2759 2396 1982 1497 576 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
523 %! 1413 2994 3852 3647 3756 4035 4418 4595 3109 1231 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
524 %! 1873 4025 5930 5656 5792 5772 5909 6152 4185 2035 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
525 %! 3110 5510 7955 8069 8139 8456 8541 8439 5276 2541 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
526 %! 1964 4462 6180 5666 5315 5409 5631 6178 4536 1998 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
527 %! 869 3215 4840 4864 4121 3579 3420 3386 3271 1430 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
528 %! 725 1361 2005 2367 2925 3006 2667 2297 1054 325]; |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
529 %! c(:,:,5,2) = [ |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
530 %! 462 754 1285 1359 1441 1605 1556 1488 938 488 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
531 %! 729 1967 2788 2732 2608 2683 2744 2830 2195 912 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
532 %! 1052 3139 4302 4101 3742 3730 3895 4103 3403 1335 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
533 %! 1007 3725 5577 5964 6165 5754 5407 5006 3846 1507 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
534 %! 1375 2969 3951 3990 4144 4183 4200 4150 2661 998 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
535 %! 1258 2090 2495 2188 2403 2664 2954 3279 1814 723 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
536 %! 388 1127 1551 1673 1525 1390 1253 1139 912 275]; |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
537 %! c(:,:,6,2) = [ |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
538 %! 19 147 384 716 1016 1059 927 570 276 80 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
539 %! 441 791 1298 1320 1401 1396 1409 1367 865 500 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
540 %! 932 1537 2155 1870 1860 1946 2221 2487 1584 874 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
541 %! 1201 2067 2705 2538 2512 2687 2806 2971 1812 756 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
542 %! 925 1976 2363 1971 1636 1600 1844 2239 1664 626 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
543 %! 372 1133 1558 1687 1570 1401 1243 1122 883 264 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
544 %! 60 270 556 857 1024 870 569 282 66 0]; |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
545 %!assert (convn(a, b, "full"), c); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
546 %!assert (convn(a, b, "same"), c(3:6,2:9,2:5,:)); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
547 %!assert (convn(a, b, "valid"), c(4,3:8,3:4,:)); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
548 |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
549 ## test correct class |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
550 %!assert (class (convn (rand(5), rand(3))), "double"); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
551 %!assert (class (convn (rand(5, "single"), rand(3))), "single"); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
552 %!assert (class (convn (rand(5), rand(3, "single"))), "single"); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
553 %!assert (class (convn (true (5), rand(3))), "double"); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
554 %!assert (class (convn (true (5), rand(3, "single"))), "single"); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
555 %!assert (class (convn (ones(5, "uint8"), rand(3))), "double"); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
556 %!assert (class (convn (rand (3, "single"), ones(5, "uint8"))), "single"); |
92226d09f91a
Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents:
17695
diff
changeset
|
557 |
17695
d6f4b01075e0
convn: give error for non-string shape argument.
Carnë Draug <carandraug@octave.org>
parents:
17336
diff
changeset
|
558 %!error convn () |
d6f4b01075e0
convn: give error for non-string shape argument.
Carnë Draug <carandraug@octave.org>
parents:
17336
diff
changeset
|
559 %!error convn (1) |
d6f4b01075e0
convn: give error for non-string shape argument.
Carnë Draug <carandraug@octave.org>
parents:
17336
diff
changeset
|
560 %!error <SHAPE type not valid> convn (1,2, "NOT_A_SHAPE") |
d6f4b01075e0
convn: give error for non-string shape argument.
Carnë Draug <carandraug@octave.org>
parents:
17336
diff
changeset
|
561 %!error convn (rand (3), 1, 1) |
14209
846273dae16b
Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
562 */ |