Mercurial > octave

annotate libinterp/corefcn/conv2.cc @ 33617:ec2635a02328 bytecode-interpreter tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge default to bytecode-interpreter.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 21 May 2024 18:29:03 +0200
parents acef2a35ba7c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
2 //
32632
2e484f9f1f18 maint: update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents: 32372
diff changeset
3 // Copyright (C) 1999-2024 The Octave Project Developers
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
4 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
7 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
9 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
14 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
19 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
23 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
24 ////////////////////////////////////////////////////////////////////////
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
25
21724
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21580
diff changeset
26 #if defined (HAVE_CONFIG_H)
21301
40de9f8f23a6 Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents: 21200
diff changeset
27 # include "config.h"
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
28 #endif
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
29
10384
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
30 #include "oct-convn.h"
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
31
15039
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents: 14607
diff changeset
32 #include "defun.h"
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
33 #include "error.h"
20940
48b2ad5ee801 maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents: 20918
diff changeset
34 #include "ovl.h"
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
35 #include "utils.h"
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
36
31605
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30888
diff changeset
37 OCTAVE_BEGIN_NAMESPACE(octave)
29958
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29876
diff changeset
38
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
39 enum Shape { SHAPE_FULL, SHAPE_SAME, SHAPE_VALID };
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
40
15039
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents: 14607
diff changeset
41 DEFUN (conv2, args, ,
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
42 doc: /* -*- texinfo -*-
30888
32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/
Rik <rik@octave.org>
parents: 30564
diff changeset
43 @deftypefn {} {@var{C} =} conv2 (@var{A}, @var{B})
32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/
Rik <rik@octave.org>
parents: 30564
diff changeset
44 @deftypefnx {} {@var{C} =} conv2 (@var{v1}, @var{v2}, @var{m})
32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/
Rik <rik@octave.org>
parents: 30564
diff changeset
45 @deftypefnx {} {@var{C} =} conv2 (@dots{}, @var{shape})
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
46 Return the 2-D convolution of @var{A} and @var{B}.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
47
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
48 The size of the result is determined by the optional @var{shape} argument
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
49 which takes the following values
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
50
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
51 @table @asis
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
52 @item @var{shape} = @qcode{"full"}
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
53 Return the full convolution. (default)
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
54
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
55 @item @var{shape} = @qcode{"same"}
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
56 Return the central part of the convolution with the same size as @var{A}.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
57 The central part of the convolution begins at the indices
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
58 @code{floor ([size(@var{B})/2] + 1)}.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
59
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
60 @item @var{shape} = @qcode{"valid"}
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
61 Return only the parts which do not include zero-padded edges.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
62 The size of the result is @code{max (size (A) - size (B) + 1, 0)}.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
63 @end table
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
64
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
65 When the third argument is a matrix, return the convolution of the matrix
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
66 @var{m} by the vector @var{v1} in the column direction and by the vector
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
67 @var{v2} in the row direction.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
68 @seealso{conv, convn}
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
69 @end deftypefn */)
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
70 {
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
71 int nargin = args.length ();
20918
6f0bd96f93c0 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20853
diff changeset
72
6f0bd96f93c0 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20853
diff changeset
73 if (nargin < 2 || nargin > 4)
6f0bd96f93c0 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20853
diff changeset
74 print_usage ();
6f0bd96f93c0 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20853
diff changeset
75
14209
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
76 std::string shape = "full"; // default
10371
dc8637fd7a76 improve conv2 performance
John W. Eaton <jwe@octave.org>
parents: 10368
diff changeset
77 bool separable = false;
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
78 convn_type ct = convn_full;
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
79
20803
c22206c1a88f eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20700
diff changeset
80 if (nargin == 3)
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
81 {
5822
4fdc2515ebad [project @ 2006-05-18 19:31:36 by jwe]
jwe
parents: 5819
diff changeset
82 if (args(2).is_string ())
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
83 shape = args(2).string_value ();
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
84 else
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
85 separable = true;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
86 }
20803
c22206c1a88f eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20700
diff changeset
87 else if (nargin == 4)
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
88 {
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
89 separable = true;
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
90 shape = args(3).string_value ();
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
91 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
92
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
93 if (args(0).ndims () > 2 || args(1).ndims () > 2)
20803
c22206c1a88f eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20700
diff changeset
94 error ("conv2: A and B must be 1-D vectors or 2-D matrices");
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
95
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
96 if (shape == "full")
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
97 ct = convn_full;
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
98 else if (shape == "same")
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
99 ct = convn_same;
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
100 else if (shape == "valid")
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
101 ct = convn_valid;
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
102 else
20803
c22206c1a88f eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20700
diff changeset
103 error ("conv2: SHAPE type not valid");
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
104
20918
6f0bd96f93c0 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20853
diff changeset
105 octave_value retval;
6f0bd96f93c0 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20853
diff changeset
106
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
107 if (separable)
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
108 {
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
109 // If user requests separable, check first two params are vectors
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
110 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
111 || ! (1 == args(1).rows () || 1 == args(1).columns ()))
20803
c22206c1a88f eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20700
diff changeset
112 error ("conv2: arguments must be vectors for separable option");
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
113
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
114 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
115 || args(2).is_single_type ())
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
116 {
23581
c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex.
Rik <rik@octave.org>
parents: 23573
diff changeset
117 if (args(0).iscomplex () || args(1).iscomplex ()
c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex.
Rik <rik@octave.org>
parents: 23573
diff changeset
118 || args(2).iscomplex ())
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
119 {
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
120 FloatComplexMatrix a (args(2).float_complex_matrix_value ());
23582
0cc2011d800e maint: Deprecate is_real_type and replace with isreal.
Rik <rik@octave.org>
parents: 23581
diff changeset
121 if (args(1).isreal () && args(2).isreal ())
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
122 {
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
123 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
124 FloatRowVector v2 (args(1).float_vector_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
125 retval = convn (a, v1, v2, ct);
15241
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 else
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
128 {
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
129 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
130 FloatComplexRowVector v2 (args(1).float_complex_vector_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
131 retval = convn (a, v1, v2, ct);
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
132 }
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 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
137 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
138 FloatMatrix a (args(2).float_matrix_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
139 retval = convn (a, v1, v2, ct);
15241
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 }
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
142 else
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
143 {
23581
c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex.
Rik <rik@octave.org>
parents: 23573
diff changeset
144 if (args(0).iscomplex () || args(1).iscomplex ()
c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex.
Rik <rik@octave.org>
parents: 23573
diff changeset
145 || args(2).iscomplex ())
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
146 {
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
147 ComplexMatrix a (args(2).complex_matrix_value ());
23582
0cc2011d800e maint: Deprecate is_real_type and replace with isreal.
Rik <rik@octave.org>
parents: 23581
diff changeset
148 if (args(1).isreal () && args(2).isreal ())
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
149 {
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
150 ColumnVector v1 (args(0).vector_value ());
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
151 RowVector v2 (args(1).vector_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
152 retval = convn (a, v1, v2, ct);
15241
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 else
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
155 {
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
156 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
157 ComplexRowVector v2 (args(1).complex_vector_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
158 retval = convn (a, v1, v2, ct);
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
159 }
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 ColumnVector v1 (args(0).vector_value ());
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
164 RowVector v2 (args(1).vector_value ());
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
165 Matrix a (args(2).matrix_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
166 retval = convn (a, v1, v2, ct);
15241
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 }
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
169 } // if (separable)
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
170 else
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
171 {
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
172 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
173 {
23581
c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex.
Rik <rik@octave.org>
parents: 23573
diff changeset
174 if (args(0).iscomplex () || args(1).iscomplex ())
15241
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 FloatComplexMatrix a (args(0).float_complex_matrix_value ());
23582
0cc2011d800e maint: Deprecate is_real_type and replace with isreal.
Rik <rik@octave.org>
parents: 23581
diff changeset
177 if (args(1).isreal ())
15241
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 FloatMatrix b (args(1).float_matrix_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
180 retval = convn (a, b, ct);
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
181 }
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
182 else
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
183 {
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
184 FloatComplexMatrix b (args(1).float_complex_matrix_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
185 retval = convn (a, b, ct);
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
186 }
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
187 }
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
188 else
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
189 {
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
190 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
191 FloatMatrix b (args(1).float_matrix_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
192 retval = convn (a, b, ct);
15241
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 {
23581
c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex.
Rik <rik@octave.org>
parents: 23573
diff changeset
197 if (args(0).iscomplex () || args(1).iscomplex ())
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
198 {
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
199 ComplexMatrix a (args(0).complex_matrix_value ());
23582
0cc2011d800e maint: Deprecate is_real_type and replace with isreal.
Rik <rik@octave.org>
parents: 23581
diff changeset
200 if (args(1).isreal ())
15241
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 Matrix b (args(1).matrix_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
203 retval = convn (a, b, ct);
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
204 }
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
205 else
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
206 {
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
207 ComplexMatrix b (args(1).complex_matrix_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
208 retval = convn (a, b, ct);
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
209 }
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
210 }
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
211 else
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
212 {
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
213 Matrix a (args(0).matrix_value ());
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
214 Matrix b (args(1).matrix_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
215 retval = convn (a, b, ct);
15241
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 }
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
218
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
219 } // if (separable)
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
220
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
221 return retval;
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
222 }
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
223
14209
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
224 /*
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
225 %!test
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
226 %! 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
227 %! 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
228
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
229 %!test
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
230 %! 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
231 %! 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
232
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
233 %!test
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
234 %! 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
235 %! 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
236
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
237 %!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
238 %! 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
239
22737
7abc25e6206a maint: Clean up code base to follow Octave coding conventions.
Rik <rik@octave.org>
parents: 22489
diff changeset
240 ## Test shapes
14209
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
241 %!shared A, B, C
32372
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
242 %! old_state = rand ("state");
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
243 %! restore_state = onCleanup (@() rand ("state", old_state));
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
244 %! rand ("state", 12345); # initialize generator to make behavior reproducible
14209
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
245 %! 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
246 %! 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
247 %! 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
248 %!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
249 %!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
250 %!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
251 %!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
252
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
253 %!test
32372
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
254 %!shared A, B, C
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
255 %! old_state = rand ("state");
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
256 %! restore_state = onCleanup (@() rand ("state", old_state));
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
257 %! rand ("state", 12345); # initialize generator to make behavior reproducible
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
258 %! A = rand (3, 4);
14209
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
259 %! 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
260 %! 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
261 %!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
262 %!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
263 %!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
264 %!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
265
22737
7abc25e6206a maint: Clean up code base to follow Octave coding conventions.
Rik <rik@octave.org>
parents: 22489
diff changeset
266 ## Clear shared variables so they are not reported for tests below
14209
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
267 %!shared
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
268
22737
7abc25e6206a maint: Clean up code base to follow Octave coding conventions.
Rik <rik@octave.org>
parents: 22489
diff changeset
269 ## Test cases from Bug #34893
23573
1b4f4ec53b4a use new script to tag fixed bugs in tests
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
270 %!assert <*34893> (conv2 ([1:5;1:5], [1:2], "same"),
22489
93ea313301f9 test: Add bug ids (<#####>) to BIST tests.
Rik <rik@octave.org>
parents: 22470
diff changeset
271 %! [4 7 10 13 10; 4 7 10 13 10])
23573
1b4f4ec53b4a use new script to tag fixed bugs in tests
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
272 %!assert <*34893> (conv2 ([1:5;1:5]', [1:2]', "same"),
22489
93ea313301f9 test: Add bug ids (<#####>) to BIST tests.
Rik <rik@octave.org>
parents: 22470
diff changeset
273 %! [4 7 10 13 10; 4 7 10 13 10]')
23573
1b4f4ec53b4a use new script to tag fixed bugs in tests
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
274 %!assert <*34893> (conv2 ([1:5;1:5], [1:2], "valid"),
22489
93ea313301f9 test: Add bug ids (<#####>) to BIST tests.
Rik <rik@octave.org>
parents: 22470
diff changeset
275 %! [4 7 10 13; 4 7 10 13])
23573
1b4f4ec53b4a use new script to tag fixed bugs in tests
John W. Eaton <jwe@octave.org>
parents: 23572
diff changeset
276 %!assert <*34893> (conv2 ([1:5;1:5]', [1:2]', "valid"),
22489
93ea313301f9 test: Add bug ids (<#####>) to BIST tests.
Rik <rik@octave.org>
parents: 22470
diff changeset
277 %! [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
278
24816
261d23b8933b test: ensure all unit tests restore global random state after setting it
Mike Miller <mtmiller@octave.org>
parents: 23219
diff changeset
279 %% Restore the rand "seed" and "state" values in order, so that the
261d23b8933b test: ensure all unit tests restore global random state after setting it
Mike Miller <mtmiller@octave.org>
parents: 23219
diff changeset
280 %% new "state" algorithm remains active after these tests complete.
261d23b8933b test: ensure all unit tests restore global random state after setting it
Mike Miller <mtmiller@octave.org>
parents: 23219
diff changeset
281 %!function restore_rand_state (seed, state)
261d23b8933b test: ensure all unit tests restore global random state after setting it
Mike Miller <mtmiller@octave.org>
parents: 23219
diff changeset
282 %! rand ("seed", seed);
261d23b8933b test: ensure all unit tests restore global random state after setting it
Mike Miller <mtmiller@octave.org>
parents: 23219
diff changeset
283 %! rand ("state", state);
261d23b8933b test: ensure all unit tests restore global random state after setting it
Mike Miller <mtmiller@octave.org>
parents: 23219
diff changeset
284 %!endfunction
261d23b8933b test: ensure all unit tests restore global random state after setting it
Mike Miller <mtmiller@octave.org>
parents: 23219
diff changeset
285
261d23b8933b test: ensure all unit tests restore global random state after setting it
Mike Miller <mtmiller@octave.org>
parents: 23219
diff changeset
286 %% FIXME: This test only passes when using the "old" random number
261d23b8933b test: ensure all unit tests restore global random state after setting it
Mike Miller <mtmiller@octave.org>
parents: 23219
diff changeset
287 %% generator by setting the "seed" parameter to any value. If
261d23b8933b test: ensure all unit tests restore global random state after setting it
Mike Miller <mtmiller@octave.org>
parents: 23219
diff changeset
288 %% the "state" parameter is used, the test fails. This probably
261d23b8933b test: ensure all unit tests restore global random state after setting it
Mike Miller <mtmiller@octave.org>
parents: 23219
diff changeset
289 %% indicates that this test is particularly fragile. This might
261d23b8933b test: ensure all unit tests restore global random state after setting it
Mike Miller <mtmiller@octave.org>
parents: 23219
diff changeset
290 %% need further investigation or a rewrite, for example using
261d23b8933b test: ensure all unit tests restore global random state after setting it
Mike Miller <mtmiller@octave.org>
parents: 23219
diff changeset
291 %% random integer values to avoid precision overflow.
14597
6980b0f35df9 conv2.c: Unmark a test as a known failure (bug #34893)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 14596
diff changeset
292 %!test
24816
261d23b8933b test: ensure all unit tests restore global random state after setting it
Mike Miller <mtmiller@octave.org>
parents: 23219
diff changeset
293 %! old_seed = rand ("seed");
261d23b8933b test: ensure all unit tests restore global random state after setting it
Mike Miller <mtmiller@octave.org>
parents: 23219
diff changeset
294 %! old_state = rand ("state");
261d23b8933b test: ensure all unit tests restore global random state after setting it
Mike Miller <mtmiller@octave.org>
parents: 23219
diff changeset
295 %! restore_state = onCleanup (@() restore_rand_state (old_seed, old_state));
14596
ad1d7a53b1ca perform convolution properly independently of matrix orientation (bug #34893)
Sunghyun Cho <sodomau@gmail.com>
parents: 14209
diff changeset
296 %! rand ("seed", 42);
ad1d7a53b1ca perform convolution properly independently of matrix orientation (bug #34893)
Sunghyun Cho <sodomau@gmail.com>
parents: 14209
diff changeset
297 %! x = rand (100);
ad1d7a53b1ca perform convolution properly independently of matrix orientation (bug #34893)
Sunghyun Cho <sodomau@gmail.com>
parents: 14209
diff changeset
298 %! y = ones (5);
ad1d7a53b1ca perform convolution properly independently of matrix orientation (bug #34893)
Sunghyun Cho <sodomau@gmail.com>
parents: 14209
diff changeset
299 %! 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
300 %! B = conv2 (x, y, "valid");
17336
b81b9d079515 Use '##' for comments which stand alone on a line.
Rik <rik@octave.org>
parents: 17281
diff changeset
301 %! 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
302
22737
7abc25e6206a maint: Clean up code base to follow Octave coding conventions.
Rik <rik@octave.org>
parents: 22489
diff changeset
303 ## Test input validation
14209
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
304 %!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
305 %!error conv2 (1)
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
306 %!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
307 %!error <SHAPE type not valid> conv2 (1,2, "NOT_A_SHAPE")
22737
7abc25e6206a maint: Clean up code base to follow Octave coding conventions.
Rik <rik@octave.org>
parents: 22489
diff changeset
308 ## Test alternate calling form which should be 2 vectors and a matrix
14209
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
309 %!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
310 %!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
311 */
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
312
15039
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents: 14607
diff changeset
313 DEFUN (convn, args, ,
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
314 doc: /* -*- texinfo -*-
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
315 @deftypefn {} {@var{C} =} convn (@var{A}, @var{B})
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
316 @deftypefnx {} {@var{C} =} convn (@var{A}, @var{B}, @var{shape})
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
317 Return the n-D convolution of @var{A} and @var{B}.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
318
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
319 The size of the result is determined by the optional @var{shape} argument
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
320 which takes the following values
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
321
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
322 @table @asis
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
323 @item @var{shape} = @qcode{"full"}
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
324 Return the full convolution. (default)
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
325
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
326 @item @var{shape} = @qcode{"same"}
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
327 Return central part of the convolution with the same size as @var{A}.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
328 The central part of the convolution begins at the indices
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
329 @code{floor ([size(@var{B})/2] + 1)}.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
330
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
331 @item @var{shape} = @qcode{"valid"}
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
332 Return only the parts which do not include zero-padded edges.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
333 The size of the result is @code{max (size (A) - size (B) + 1, 0)}.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
334 @end table
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
335
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
336 @seealso{conv2, conv}
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
337 @end deftypefn */)
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 int nargin = args.length ();
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
340
10384
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
341 if (nargin < 2 || nargin > 3)
20803
c22206c1a88f eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20700
diff changeset
342 print_usage ();
c22206c1a88f eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20700
diff changeset
343
20918
6f0bd96f93c0 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20853
diff changeset
344 std::string shape = "full"; // default
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
345 convn_type ct = convn_full;
20918
6f0bd96f93c0 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20853
diff changeset
346
20803
c22206c1a88f eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20700
diff changeset
347 if (nargin == 3)
20700
68e3a747ca02 rename octave_value value extractors that accept error message args
John W. Eaton <jwe@octave.org>
parents: 20582
diff changeset
348 shape = args(2).xstring_value ("convn: SHAPE must be a string");
10384
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
349
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
350 if (shape == "full")
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
351 ct = convn_full;
10384
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
352 else if (shape == "same")
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
353 ct = convn_same;
10384
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
354 else if (shape == "valid")
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
355 ct = convn_valid;
10384
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
356 else
20803
c22206c1a88f eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20700
diff changeset
357 error ("convn: SHAPE type not valid");
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
358
20918
6f0bd96f93c0 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20853
diff changeset
359 octave_value retval;
6f0bd96f93c0 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20853
diff changeset
360
11083
bb8bf77f2242 conv2.cc: style fixes; update docstrings
John W. Eaton <jwe@octave.org>
parents: 10840
diff changeset
361 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
362 {
23581
c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex.
Rik <rik@octave.org>
parents: 23573
diff changeset
363 if (args(0).iscomplex () || args(1).iscomplex ())
10384
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 a (args(0).float_complex_array_value ());
23582
0cc2011d800e maint: Deprecate is_real_type and replace with isreal.
Rik <rik@octave.org>
parents: 23581
diff changeset
366 if (args(1).isreal ())
10384
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 FloatNDArray b (args(1).float_array_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
369 retval = convn (a, b, ct);
10384
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 else
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
372 {
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
373 FloatComplexNDArray b (args(1).float_complex_array_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
374 retval = convn (a, b, ct);
10384
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 }
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
377 else
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
378 {
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
379 FloatNDArray a (args(0).float_array_value ());
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
380 FloatNDArray b (args(1).float_array_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
381 retval = convn (a, b, ct);
10384
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 }
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
384 else
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
385 {
23581
c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex.
Rik <rik@octave.org>
parents: 23573
diff changeset
386 if (args(0).iscomplex () || args(1).iscomplex ())
10384
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 a (args(0).complex_array_value ());
23582
0cc2011d800e maint: Deprecate is_real_type and replace with isreal.
Rik <rik@octave.org>
parents: 23581
diff changeset
389 if (args(1).isreal ())
10384
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 NDArray b (args(1).array_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
392 retval = convn (a, b, ct);
10384
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 else
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
395 {
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
396 ComplexNDArray b (args(1).complex_array_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
397 retval = convn (a, b, ct);
10384
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
398 }
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
399 }
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
400 else
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
401 {
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
402 NDArray a (args(0).array_value ());
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
403 NDArray b (args(1).array_value ());
29961
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
404 retval = convn (a, b, ct);
10384
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
405 }
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
406 }
5819
e54c11df0524 [project @ 2006-05-17 20:34:52 by jwe]
jwe
parents:
diff changeset
407
15241
2cdace1ba287 Validate conv2 inputs are 2-D matrices (Bug #37200)
Rik <rik@octave.org>
parents: 15195
diff changeset
408 return retval;
10384
978f5c94b11f initial implementation of conv2/convn in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents: 10371
diff changeset
409 }
14209
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
410
846273dae16b Return correct part of convolution for 'same' parameter in conv2, convn (Bug #34893).
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
411 /*
22489
93ea313301f9 test: Add bug ids (<#####>) to BIST tests.
Rik <rik@octave.org>
parents: 22470
diff changeset
412 %!test <39314>
17696
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
413 %! 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
414 %! 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
415 %! 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
416 %! 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
417
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
418 ## The following test may look weird since we are using the output
17837
73b239db1594 Make known conv failures xtests.
Rik <rik@octave.org>
parents: 17834
diff changeset
419 ## of convn to test itself. However, because calculations are done
17696
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
420 ## differently based on the shape option, it will help to catch some
17837
73b239db1594 Make known conv failures xtests.
Rik <rik@octave.org>
parents: 17834
diff changeset
421 ## bugs. See also bug #39314.
73b239db1594 Make known conv failures xtests.
Rik <rik@octave.org>
parents: 17834
diff changeset
422 ## FIXME: The "valid" option uses an entirely different code path
73b239db1594 Make known conv failures xtests.
Rik <rik@octave.org>
parents: 17834
diff changeset
423 ## through C++ and Fortran to calculate inner convolution.
73b239db1594 Make known conv failures xtests.
Rik <rik@octave.org>
parents: 17834
diff changeset
424 ## The terms in the convolution added in reverse order compared
73b239db1594 Make known conv failures xtests.
Rik <rik@octave.org>
parents: 17834
diff changeset
425 ## to the "full" option. This produces differences on the order
73b239db1594 Make known conv failures xtests.
Rik <rik@octave.org>
parents: 17834
diff changeset
426 ## of tens of eps. This should be fixed, but in the meantime
22470
9d4cb0cf9cd2 maint: tag xtests and tests that fail on some systems with bug numbers
Mike Miller <mtmiller@octave.org>
parents: 22407
diff changeset
427 ## the tests will be marked as known failures.
17696
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
428 %!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
429 %! ## test 3D by 3D
32372
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
430 %! old_state = rand ("state");
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
431 %! restore_state = onCleanup (@() rand ("state", old_state));
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
432 %! rand ("state", 12345); # initialize generator to make behavior reproducible
17696
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
433 %! 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
434 %! 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
435 %! c = convn (a, b, "full");
17834
7957aedf0b2d Fix 4 %!tests for convolution.
Rik <rik@octave.org>
parents: 17787
diff changeset
436 %!assert (convn (a, b, "same"), c(2:11,2:11,2:11))
22470
9d4cb0cf9cd2 maint: tag xtests and tests that fail on some systems with bug numbers
Mike Miller <mtmiller@octave.org>
parents: 22407
diff changeset
437 %!test <39314>
33304
acef2a35ba7c test: speed up BIST for the central part of convn with 'full' shape.
David Miguel Susano Pinto <carandraug@octave.org>
parents: 32632
diff changeset
438 %! assert (all ((convn (a, b, "valid") == c(3:10,3:10,3:10))(:)),
acef2a35ba7c test: speed up BIST for the central part of convn with 'full' shape.
David Miguel Susano Pinto <carandraug@octave.org>
parents: 32632
diff changeset
439 %! "central part of convn 'full' differs from convn 'valid'");
17696
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
440 %!
17834
7957aedf0b2d Fix 4 %!tests for convolution.
Rik <rik@octave.org>
parents: 17787
diff changeset
441 %!test
32372
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
442 %! old_state = rand ("state");
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
443 %! restore_state = onCleanup (@() rand ("state", old_state));
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
444 %! rand ("state", 12345); # initialize generator to make behavior reproducible
17696
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
445 %! ## 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
446 %! 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
447 %! 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
448 %! c = convn (a, b, "full");
17834
7957aedf0b2d Fix 4 %!tests for convolution.
Rik <rik@octave.org>
parents: 17787
diff changeset
449 %!assert (convn (a, b, "same"), c(2:11,2:11,:))
22470
9d4cb0cf9cd2 maint: tag xtests and tests that fail on some systems with bug numbers
Mike Miller <mtmiller@octave.org>
parents: 22407
diff changeset
450 %!test <39314>
33304
acef2a35ba7c test: speed up BIST for the central part of convn with 'full' shape.
David Miguel Susano Pinto <carandraug@octave.org>
parents: 32632
diff changeset
451 %! assert (all ((convn (a, b, "valid") == c(3:10,3:10,:))(:)),
acef2a35ba7c test: speed up BIST for the central part of convn with 'full' shape.
David Miguel Susano Pinto <carandraug@octave.org>
parents: 32632
diff changeset
452 %! "central part of convn 'full' differs from convn 'valid'");
17696
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
453 %!
17834
7957aedf0b2d Fix 4 %!tests for convolution.
Rik <rik@octave.org>
parents: 17787
diff changeset
454 %!test
32372
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
455 %! old_state = rand ("state");
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
456 %! restore_state = onCleanup (@() rand ("state", old_state));
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
457 %! rand ("state", 12345); # initialize generator to make behavior reproducible
17696
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
458 %! ## 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
459 %! 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
460 %! 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
461 %! c = convn (a, b, "full");
17834
7957aedf0b2d Fix 4 %!tests for convolution.
Rik <rik@octave.org>
parents: 17787
diff changeset
462 %!assert (convn (a, b, "same"), c(2:11,2:11,2))
7957aedf0b2d Fix 4 %!tests for convolution.
Rik <rik@octave.org>
parents: 17787
diff changeset
463 %!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
464 %!
17834
7957aedf0b2d Fix 4 %!tests for convolution.
Rik <rik@octave.org>
parents: 17787
diff changeset
465 %!test
32372
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
466 %! old_state = rand ("state");
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
467 %! restore_state = onCleanup (@() rand ("state", old_state));
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
468 %! rand ("state", 12345); # initialize generator to make behavior reproducible
17834
7957aedf0b2d Fix 4 %!tests for convolution.
Rik <rik@octave.org>
parents: 17787
diff changeset
469 %! ## test multiple different number of dimensions, with odd and even numbers
17696
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
470 %! 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
471 %! 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
472 %! 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
473 %!assert (convn (a, b, "same"), c(3:12,2:16,2:8,2:9,:))
22470
9d4cb0cf9cd2 maint: tag xtests and tests that fail on some systems with bug numbers
Mike Miller <mtmiller@octave.org>
parents: 22407
diff changeset
474 %!test <39314>
33304
acef2a35ba7c test: speed up BIST for the central part of convn with 'full' shape.
David Miguel Susano Pinto <carandraug@octave.org>
parents: 32632
diff changeset
475 %! assert (all ((convn (a, b, "valid") == c(4:10,3:15,2:7,3:8,:))(:)),
acef2a35ba7c test: speed up BIST for the central part of convn with 'full' shape.
David Miguel Susano Pinto <carandraug@octave.org>
parents: 32632
diff changeset
476 %! "central part of convn 'full' differs from convn 'valid'");
17696
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
477
17834
7957aedf0b2d Fix 4 %!tests for convolution.
Rik <rik@octave.org>
parents: 17787
diff changeset
478 %!test
17696
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
479 %! 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
480 %! 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
481 %! 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
482 %! c(:,:,1,1) = [
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
483 %! 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
484 %! 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
485 %! 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
486 %! 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
487 %! 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
488 %! 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
489 %! 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
490 %! c(:,:,2,1) = [
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
491 %! 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
492 %! 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
493 %! 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
494 %! 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
495 %! 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
496 %! 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
497 %! 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
498 %! c(:,:,3,1) = [
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
499 %! 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
500 %! 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
501 %! 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
502 %! 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
503 %! 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
504 %! 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
505 %! 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
506 %! c(:,:,4,1) = [
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
507 %! 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
508 %! 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
509 %! 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
510 %! 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
511 %! 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
512 %! 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
513 %! 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
514 %! c(:,:,5,1) = [
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
515 %! 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
516 %! 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
517 %! 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
518 %! 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
519 %! 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
520 %! 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
521 %! 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
522 %! c(:,:,6,1) = [
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
523 %! 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
524 %! 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
525 %! 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
526 %! 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
527 %! 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
528 %! 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
529 %! 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
530 %! c(:,:,1,2) = [
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
531 %! 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
532 %! 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
533 %! 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
534 %! 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
535 %! 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
536 %! 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
537 %! 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
538 %! c(:,:,2,2) = [
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
539 %! 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
540 %! 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
541 %! 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
542 %! 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
543 %! 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
544 %! 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
545 %! 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
546 %! c(:,:,3,2) = [
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
547 %! 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
548 %! 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
549 %! 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
550 %! 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
551 %! 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
552 %! 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
553 %! 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
554 %! c(:,:,4,2) = [
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
555 %! 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
556 %! 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
557 %! 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
558 %! 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
559 %! 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
560 %! 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
561 %! 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
562 %! c(:,:,5,2) = [
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
563 %! 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
564 %! 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
565 %! 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
566 %! 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
567 %! 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
568 %! 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
569 %! 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
570 %! c(:,:,6,2) = [
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
571 %! 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
572 %! 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
573 %! 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
574 %! 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
575 %! 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
576 %! 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
577 %! 60 270 556 857 1024 870 569 282 66 0];
28915
c40a367a84c0 maint: Use Octave convention of space after function name in libinterp/.
Rik <rik@octave.org>
parents: 28888
diff changeset
578 %!assert (convn (a, b, "full"), c)
c40a367a84c0 maint: Use Octave convention of space after function name in libinterp/.
Rik <rik@octave.org>
parents: 28888
diff changeset
579 %!assert (convn (a, b, "same"), c(3:6,2:9,2:5,:))
c40a367a84c0 maint: Use Octave convention of space after function name in libinterp/.
Rik <rik@octave.org>
parents: 28888
diff changeset
580 %!assert (convn (a, b, "valid"), c(4,3:8,3:4,:))
17696
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
581
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
582 ## test correct class
32372
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
583 %!shared a, b, c, d
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
584 %! old_state = rand ("state");
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
585 %! restore_state = onCleanup (@() rand ("state", old_state));
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
586 %! rand ("state", 12345); # initialize generator to make behavior reproducible
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
587 %! a = rand (5);
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
588 %! b = rand (3);
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
589 %! c = rand (5, "single");
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
590 %! d = rand (3, "single");
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
591 %!assert (class (convn (a, b)), "double")
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
592 %!assert (class (convn (c, b)), "single")
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
593 %!assert (class (convn (a, d)), "single")
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
594 %!assert (class (convn (true (5), b)), "double")
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
595 %!assert (class (convn (true (5), d)), "single")
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
596 %!assert (class (convn (ones (5, "uint8"), b)), "double")
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
597 %!assert (class (convn (d, ones (5, "uint8"))), "single")
17696
92226d09f91a Return correct convolution for valid shape argument in convn (bug #39314)
Marco Cecchetti <mrcekets@gmail.com>
parents: 17695
diff changeset
598
17695
d6f4b01075e0 convn: give error for non-string shape argument.
Carnë Draug <carandraug@octave.org>
parents: 17336
diff changeset
599 %!error convn ()
d6f4b01075e0 convn: give error for non-string shape argument.
Carnë Draug <carandraug@octave.org>
parents: 17336
diff changeset
600 %!error convn (1)
d6f4b01075e0 convn: give error for non-string shape argument.
Carnë Draug <carandraug@octave.org>
parents: 17336
diff changeset
601 %!error <SHAPE type not valid> convn (1,2, "NOT_A_SHAPE")
32372
2c0dc2ac3d3b Make random numbers in BISTs reproducible
Arun Giridhar <arungiridhar@gmail.com>
parents: 31706
diff changeset
602 %!error convn (b, 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
603 */
29958
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29876
diff changeset
604
31605
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30888
diff changeset
605 OCTAVE_END_NAMESPACE(octave)