octave: libinterp/corefcn/dot.cc annotate

annotate libinterp/corefcn/dot.cc @ 30723:08b08b7f05b2

Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Define 4 new inline functions in error.h (panic_if, panic_unless, error_if, error_unless) that call either assert() or Octave's own error() function. Replace calls to assert() in code that maintains state and for which no recovery on detection of a problem is possible with calls to panic_XXX. Replace calls to assert() in interpreter code which could simply return to the Octave prompt when a problem is detected with calls to error_XXX. * error.h (panic_if, panic_unless): New functions which eventually call can call assert(). panic_if (COND) calls assert if COND is true. panic_unless (COND) calls assert if COND is false. * error.h (error_if, error_unless): New functions which eventually call can call Octave's error() function. error_if (COND) calls assert if COND is true. error_unless (COND) calls assert if COND is false. * cellfun.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, dot.cc, error.cc, graphics.cc, kron.cc, mex.cc, oct-map.cc, oct-stream.cc, pr-output.cc, schur.cc, stack-frame.cc, typecast.cc, variables.cc, ov-base.cc, ov-class.cc, ov-fcn-handle.cc, ov-struct.cc, ov-usr-fcn.cc, ov.h, ovl.cc, ops.h, profiler.cc, pt-classdef.cc, pt-eval.cc, pt-idx.cc, pt-pr-code.cc, pt-tm-const.cc, token.cc: Replace direct calls to C library assert() with Octave specialty functions.

author	Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org>
date	Mon, 07 Feb 2022 21:47:53 -0800
parents	796f54d4ddbf
children	32d2b6604a9f

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 //
30564 796f54d4ddbf update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 29997 diff changeset	3 // Copyright (C) 2009-2022 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 ////////////////////////////////////////////////////////////////////////
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21660 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"
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	28 #endif
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	29
22322 93b3cdd36854 move most f77 function decls to separate header files John W. Eaton <jwe@octave.org> parents: 22135 diff changeset	30 #include "lo-blas-proto.h"
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	31 #include "mx-base.h"
26599 5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	32
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	33 #include "builtin-defun-decls.h"
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	34 #include "defun.h"
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	35 #include "error.h"
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	36 #include "parse.h"
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	37
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	38 OCTAVE_NAMESPACE_BEGIN
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	39
30723 08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30564 diff changeset	40 // FIXME: input 'y' is no longer necessary (2/5/2022).
08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30564 diff changeset	41 // At some point it would be better to change all occurrences of
08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30564 diff changeset	42 // get_red_dims to eliminate this input parameter.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	43 static void
30723 08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30564 diff changeset	44 get_red_dims (const dim_vector& x, const dim_vector& /* y */, int dim,
22980 b4346e1b5b45 use F77_INT instead of octave_idx_type for libinterp dot function John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	45 dim_vector& z, F77_INT& m, F77_INT& n, F77_INT& k)
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	46 {
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	47 int nd = x.ndims ();
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	48 z = dim_vector::alloc (nd);
22980 b4346e1b5b45 use F77_INT instead of octave_idx_type for libinterp dot function John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	49 octave_idx_type tmp_m = 1;
b4346e1b5b45 use F77_INT instead of octave_idx_type for libinterp dot function John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	50 octave_idx_type tmp_n = 1;
b4346e1b5b45 use F77_INT instead of octave_idx_type for libinterp dot function John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	51 octave_idx_type tmp_k = 1;
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	52 for (int i = 0; i < nd; i++)
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	53 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	54 if (i < dim)
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	55 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	56 z(i) = x(i);
22980 b4346e1b5b45 use F77_INT instead of octave_idx_type for libinterp dot function John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	57 tmp_m *= x(i);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	58 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	59 else if (i > dim)
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	60 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	61 z(i) = x(i);
22980 b4346e1b5b45 use F77_INT instead of octave_idx_type for libinterp dot function John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	62 tmp_n *= x(i);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	63 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	64 else
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	65 {
26493 bc6237a189e1 dot.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	66 z(i) = 1;
22980 b4346e1b5b45 use F77_INT instead of octave_idx_type for libinterp dot function John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	67 tmp_k = x(i);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	68 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	69 }
22980 b4346e1b5b45 use F77_INT instead of octave_idx_type for libinterp dot function John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	70
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	71 m = to_f77_int (tmp_m);
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	72 n = to_f77_int (tmp_n);
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	73 k = to_f77_int (tmp_k);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	74 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	75
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	76 DEFUN (dot, 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	77 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	78 @deftypefn {} {} dot (@var{x}, @var{y}, @var{dim})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	79 Compute the dot product of two vectors.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	80
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	81 If @var{x} and @var{y} are matrices, calculate the dot products along the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	82 first non-singleton dimension.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	83
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	84 If the optional argument @var{dim} is given, calculate the dot products
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	85 along this dimension.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	86
26599 5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	87 Implementation Note: This is equivalent to
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	88 @code{sum (conj (@var{X}) .* @var{Y}, @var{dim})}, but avoids forming a
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	89 temporary array and is faster. When @var{X} and @var{Y} are column vectors,
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	90 the result is equivalent to @code{@var{X}' * @var{Y}}. Although, @code{dot}
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	91 is defined for integer arrays, the output may differ from the expected result
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	92 due to the limited range of integer objects.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	93 @seealso{cross, divergence}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	94 @end deftypefn */)
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	95 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	96 int nargin = args.length ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	97
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	98 if (nargin < 2 \|\| nargin > 3)
20802 8bb38ba1bad6 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20556 diff changeset	99 print_usage ();
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	100
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	101 octave_value retval;
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	102 octave_value argx = args(0);
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	103 octave_value argy = args(1);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	104
23586 f6c5db0a02e7 maint: Deprecate is_numeric_type and replace with isnumeric. Rik <rik@octave.org> parents: 23585 diff changeset	105 if (! argx.isnumeric () \|\| ! argy.isnumeric ())
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	106 error ("dot: X and Y must be numeric");
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	107
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	108 dim_vector dimx = argx.dims ();
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	109 dim_vector dimy = argy.dims ();
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	110 bool match = dimx == dimy;
23592 80e3bfb7bd5a maint: Deprecate is_vector and replace with isvector. Rik <rik@octave.org> parents: 23586 diff changeset	111 if (! match && nargin == 2 && dimx.isvector () && dimy.isvector ())
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	112 {
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	113 // Change to column vectors.
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	114 dimx = dimx.redim (1);
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	115 argx = argx.reshape (dimx);
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	116 dimy = dimy.redim (1);
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	117 argy = argy.reshape (dimy);
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	118 match = dimx == dimy;
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	119 }
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	120
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	121 if (! match)
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	122 error ("dot: sizes of X and Y must match");
20556 4bed806ee3d4 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20218 diff changeset	123
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	124 int dim;
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	125 if (nargin == 2)
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	126 dim = dimx.first_non_singleton ();
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	127 else
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	128 dim = args(2).int_value (true) - 1;
20556 4bed806ee3d4 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20218 diff changeset	129
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	130 if (dim < 0)
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	131 error ("dot: DIM must be a valid dimension");
20556 4bed806ee3d4 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20218 diff changeset	132
22980 b4346e1b5b45 use F77_INT instead of octave_idx_type for libinterp dot function John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	133 F77_INT m, n, k;
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	134 dim_vector dimz;
23581 c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex. Rik <rik@octave.org> parents: 23220 diff changeset	135 if (argx.iscomplex () \|\| argy.iscomplex ())
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	136 {
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	137 if (argx.is_single_type () \|\| argy.is_single_type ())
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	138 {
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	139 FloatComplexNDArray x = argx.float_complex_array_value ();
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	140 FloatComplexNDArray y = argy.float_complex_array_value ();
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	141 get_red_dims (dimx, dimy, dim, dimz, m, n, k);
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	142 FloatComplexNDArray z (dimz);
20556 4bed806ee3d4 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20218 diff changeset	143
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	144 F77_XFCN (cdotc3, CDOTC3, (m, n, k,
22135 407c66ae1e20 reduce warnings from GCC's link-time optimization feature (bug #48531) John W. Eaton <jwe@octave.org> parents: 22133 diff changeset	145 F77_CONST_CMPLX_ARG (x.data ()), F77_CONST_CMPLX_ARG (y.data ()),
407c66ae1e20 reduce warnings from GCC's link-time optimization feature (bug #48531) John W. Eaton <jwe@octave.org> parents: 22133 diff changeset	146 F77_CMPLX_ARG (z.fortran_vec ())));
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	147 retval = z;
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	148 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	149 else
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	150 {
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	151 ComplexNDArray x = argx.complex_array_value ();
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	152 ComplexNDArray y = argy.complex_array_value ();
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	153 get_red_dims (dimx, dimy, dim, dimz, m, n, k);
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	154 ComplexNDArray z (dimz);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	155
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	156 F77_XFCN (zdotc3, ZDOTC3, (m, n, k,
22135 407c66ae1e20 reduce warnings from GCC's link-time optimization feature (bug #48531) John W. Eaton <jwe@octave.org> parents: 22133 diff changeset	157 F77_CONST_DBLE_CMPLX_ARG (x.data ()), F77_CONST_DBLE_CMPLX_ARG (y.data ()),
407c66ae1e20 reduce warnings from GCC's link-time optimization feature (bug #48531) John W. Eaton <jwe@octave.org> parents: 22133 diff changeset	158 F77_DBLE_CMPLX_ARG (z.fortran_vec ())));
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	159 retval = z;
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	160 }
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	161 }
23585 570170b6eb09 maint: Deprecate is_float_type and replace with isfloat. Rik <rik@octave.org> parents: 23581 diff changeset	162 else if (argx.isfloat () && argy.isfloat ())
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	163 {
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	164 if (argx.is_single_type () \|\| argy.is_single_type ())
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	165 {
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	166 FloatNDArray x = argx.float_array_value ();
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	167 FloatNDArray y = argy.float_array_value ();
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	168 get_red_dims (dimx, dimy, dim, dimz, m, n, k);
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	169 FloatNDArray z (dimz);
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	170
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	171 F77_XFCN (sdot3, SDOT3, (m, n, k, x.data (), y.data (),
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	172 z.fortran_vec ()));
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	173 retval = z;
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	174 }
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	175 else
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	176 {
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	177 NDArray x = argx.array_value ();
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	178 NDArray y = argy.array_value ();
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	179 get_red_dims (dimx, dimy, dim, dimz, m, n, k);
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	180 NDArray z (dimz);
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	181
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	182 F77_XFCN (ddot3, DDOT3, (m, n, k, x.data (), y.data (),
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	183 z.fortran_vec ()));
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	184 retval = z;
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	185 }
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	186 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	187 else
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	188 {
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	189 // Non-optimized evaluation.
26599 5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	190 // FIXME: This may not do what the user expects.
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	191 // It might be more useful to issue a warning, or even an error, instead
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	192 // of calculating possibly garbage results.
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	193 // Think of the dot product of two int8 vectors where the multiplications
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	194 // exceed intmax.
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	195 octave_value_list tmp;
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	196 tmp(1) = dim + 1;
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	197 tmp(0) = binary_op (octave_value::op_el_mul, argx, argy);
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	198
26599 5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	199 tmp = Fsum (tmp, 1);
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	200 if (! tmp.empty ())
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	201 retval = tmp(0);
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	202 }
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	203
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	204 return retval;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	205 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	206
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	207 /*
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	208 %!assert (dot ([1, 2], [2, 3]), 8)
12788 9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	209
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	210 %!test
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	211 %! x = [2, 1; 2, 1];
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	212 %! y = [-0.5, 2; 0.5, -2];
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	213 %! assert (dot (x, y), [0 0]);
19141 25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	214 %! assert (dot (single (x), single (y)), single ([0 0]));
12788 9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	215
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	216 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	217 %! x = [1+i, 3-i; 1-i, 3-i];
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	218 %! assert (dot (x, x), [4, 20]);
19141 25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	219 %! assert (dot (single (x), single (x)), single ([4, 20]));
15239 a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	220
a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	221 %!test
26599 5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	222 %! x = int8 ([1, 2]);
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	223 %! y = int8 ([2, 3]);
15239 a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	224 %! assert (dot (x, y), 8);
a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	225
a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	226 %!test
26599 5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	227 %! x = int8 ([1, 2; 3, 4]);
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	228 %! y = int8 ([5, 6; 7, 8]);
15239 a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	229 %! assert (dot (x, y), [26 44]);
a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	230 %! assert (dot (x, y, 2), [17; 53]);
a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	231 %! assert (dot (x, y, 3), [5 12; 21 32]);
a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	232
26599 5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	233 ## This is, perhaps, surprising. Integer maximums and saturation mechanics
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	234 ## prevent accurate value from being calculated.
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	235 %!test
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	236 %! x = int8 ([127]);
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	237 %! assert (dot (x, x), 127);
5ab12183280d dot.cc: Call Fsum directly rather than using feval. Rik <rik@octave.org> parents: 26493 diff changeset	238
22737 7abc25e6206a maint: Clean up code base to follow Octave coding conventions. Rik <rik@octave.org> parents: 22323 diff changeset	239 ## Test input validation
18636 60562e5c8bfb Correctly validate arguments to dot function (bug #42061). Rik <rik@octave.org> parents: 17787 diff changeset	240 %!error dot ()
60562e5c8bfb Correctly validate arguments to dot function (bug #42061). Rik <rik@octave.org> parents: 17787 diff changeset	241 %!error dot (1)
60562e5c8bfb Correctly validate arguments to dot function (bug #42061). Rik <rik@octave.org> parents: 17787 diff changeset	242 %!error dot (1,2,3,4)
60562e5c8bfb Correctly validate arguments to dot function (bug #42061). Rik <rik@octave.org> parents: 17787 diff changeset	243 %!error <X and Y must be numeric> dot ({1,2}, [3,4])
60562e5c8bfb Correctly validate arguments to dot function (bug #42061). Rik <rik@octave.org> parents: 17787 diff changeset	244 %!error <X and Y must be numeric> dot ([1,2], {3,4})
60562e5c8bfb Correctly validate arguments to dot function (bug #42061). Rik <rik@octave.org> parents: 17787 diff changeset	245 %!error <sizes of X and Y must match> dot ([1 2], [1 2 3])
60562e5c8bfb Correctly validate arguments to dot function (bug #42061). Rik <rik@octave.org> parents: 17787 diff changeset	246 %!error <sizes of X and Y must match> dot ([1 2]', [1 2 3]')
60562e5c8bfb Correctly validate arguments to dot function (bug #42061). Rik <rik@octave.org> parents: 17787 diff changeset	247 %!error <sizes of X and Y must match> dot (ones (2,2), ones (2,3))
60562e5c8bfb Correctly validate arguments to dot function (bug #42061). Rik <rik@octave.org> parents: 17787 diff changeset	248 %!error <DIM must be a valid dimension> dot ([1 2], [1 2], 0)
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	249 */
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	250
25567 8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	251 template <typename T>
29997 58f3f8b086f4 * dot.cc (blkmm_internal): Make internal functions static. John W. Eaton <jwe@octave.org> parents: 29961 diff changeset	252 static void
25567 8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	253 blkmm_internal (const T& x, const T& y, T& z,
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	254 F77_INT m, F77_INT n, F77_INT k, F77_INT np);
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	255
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	256 template <>
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	257 void
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	258 blkmm_internal (const FloatComplexNDArray& x, const FloatComplexNDArray& y,
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	259 FloatComplexNDArray& z,
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	260 F77_INT m, F77_INT n, F77_INT k, F77_INT np)
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	261 {
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	262 F77_XFCN (cmatm3, CMATM3, (m, n, k, np,
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	263 F77_CONST_CMPLX_ARG (x.data ()),
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	264 F77_CONST_CMPLX_ARG (y.data ()),
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	265 F77_CMPLX_ARG (z.fortran_vec ())));
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	266 }
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	267
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	268 template <>
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	269 void
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	270 blkmm_internal (const ComplexNDArray& x, const ComplexNDArray& y,
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	271 ComplexNDArray& z,
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	272 F77_INT m, F77_INT n, F77_INT k, F77_INT np)
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	273 {
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	274 F77_XFCN (zmatm3, ZMATM3, (m, n, k, np,
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	275 F77_CONST_DBLE_CMPLX_ARG (x.data ()),
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	276 F77_CONST_DBLE_CMPLX_ARG (y.data ()),
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	277 F77_DBLE_CMPLX_ARG (z.fortran_vec ())));
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	278 }
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	279
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	280 template <>
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	281 void
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	282 blkmm_internal (const FloatNDArray& x, const FloatNDArray& y, FloatNDArray& z,
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	283 F77_INT m, F77_INT n, F77_INT k, F77_INT np)
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	284 {
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	285 F77_XFCN (smatm3, SMATM3, (m, n, k, np,
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	286 x.data (), y.data (),
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	287 z.fortran_vec ()));
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	288 }
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	289
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	290 template <>
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	291 void
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	292 blkmm_internal (const NDArray& x, const NDArray& y, NDArray& z,
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	293 F77_INT m, F77_INT n, F77_INT k, F77_INT np)
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	294 {
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	295 F77_XFCN (dmatm3, DMATM3, (m, n, k, np,
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	296 x.data (), y.data (),
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	297 z.fortran_vec ()));
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	298 }
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	299
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	300 static void
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	301 get_blkmm_dims (const dim_vector& dimx, const dim_vector& dimy,
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	302 F77_INT& m, F77_INT& n, F77_INT& k, F77_INT& np,
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	303 dim_vector& dimz)
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	304 {
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	305 int nd = dimx.ndims ();
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	306
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	307 m = to_f77_int (dimx(0));
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	308 k = to_f77_int (dimx(1));
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	309 n = to_f77_int (dimy(1));
25567 8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	310
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	311 octave_idx_type tmp_np = 1;
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	312
26493 bc6237a189e1 dot.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	313 bool match = ((dimy(0) == k) && (nd == dimy.ndims ()));
25567 8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	314
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	315 dimz = dim_vector::alloc (nd);
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	316
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	317 dimz(0) = m;
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	318 dimz(1) = n;
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	319 for (int i = 2; match && i < nd; i++)
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	320 {
26493 bc6237a189e1 dot.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	321 match = (dimx(i) == dimy(i));
25567 8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	322 dimz(i) = dimx(i);
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	323 tmp_np *= dimz(i);
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	324 }
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	325
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	326 np = to_f77_int (tmp_np);
25567 8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	327
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	328 if (! match)
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	329 error ("blkmm: A and B dimensions don't match: (%s) and (%s)",
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	330 dimx.str ().c_str (), dimy.str ().c_str ());
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	331 }
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	332
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	333 template <typename T>
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	334 T
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	335 do_blkmm (const octave_value& xov, const octave_value& yov)
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	336 {
25606 959657cab846 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 25567 diff changeset	337 const T x = octave_value_extract<T> (xov);
959657cab846 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 25567 diff changeset	338 const T y = octave_value_extract<T> (yov);
25567 8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	339 F77_INT m, n, k, np;
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	340 dim_vector dimz;
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	341
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	342 get_blkmm_dims (x.dims (), y.dims (), m, n, k, np, dimz);
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	343
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	344 T z (dimz);
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	345
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	346 if (n != 0 && m != 0)
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	347 blkmm_internal<T> (x, y, z, m, n, k, np);
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	348
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	349 return z;
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	350 }
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	351
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	352 DEFUN (blkmm, 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	353 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	354 @deftypefn {} {} blkmm (@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	355 Compute products of matrix blocks.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	356
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	357 The blocks are given as 2-dimensional subarrays of the arrays @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	358 @var{B}. The size of @var{A} must have the form @code{[m,k,@dots{}]} and
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	359 size of @var{B} must be @code{[k,n,@dots{}]}. The result is then of size
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	360 @code{[m,n,@dots{}]} and is computed as follows:
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	361
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	362 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	363 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	364 for i = 1:prod (size (@var{A})(3:end))
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	365 @var{C}(:,:,i) = @var{A}(:,:,i) * @var{B}(:,:,i)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	366 endfor
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	367 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	368 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	369 @end deftypefn */)
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	370 {
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20802 diff changeset	371 if (args.length () != 2)
20802 8bb38ba1bad6 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20556 diff changeset	372 print_usage ();
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	373
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	374 octave_value retval;
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	375
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	376 octave_value argx = args(0);
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	377 octave_value argy = args(1);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	378
23586 f6c5db0a02e7 maint: Deprecate is_numeric_type and replace with isnumeric. Rik <rik@octave.org> parents: 23585 diff changeset	379 if (! argx.isnumeric () \|\| ! argy.isnumeric ())
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	380 error ("blkmm: A and B must be numeric");
20556 4bed806ee3d4 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20218 diff changeset	381
23581 c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex. Rik <rik@octave.org> parents: 23220 diff changeset	382 if (argx.iscomplex () \|\| argy.iscomplex ())
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	383 {
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	384 if (argx.is_single_type () \|\| argy.is_single_type ())
25567 8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	385 retval = do_blkmm<FloatComplexNDArray> (argx, argy);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	386 else
25567 8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	387 retval = do_blkmm<ComplexNDArray> (argx, argy);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	388 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	389 else
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	390 {
6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	391 if (argx.is_single_type () \|\| argy.is_single_type ())
25567 8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	392 retval = do_blkmm<FloatNDArray> (argx, argy);
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	393 else
25567 8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	394 retval = do_blkmm<NDArray> (argx, argy);
20918 6f0bd96f93c0 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	395 }
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	396
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	397 return retval;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	398 }
12788 9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	399
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	400 /*
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	401 %!test
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	402 %! x(:,:,1) = [1 2; 3 4];
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	403 %! x(:,:,2) = [1 1; 1 1];
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	404 %! z(:,:,1) = [7 10; 15 22];
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	405 %! z(:,:,2) = [2 2; 2 2];
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	406 %! assert (blkmm (x,x), z);
19141 25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	407 %! assert (blkmm (single (x), single (x)), single (z));
25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	408 %! assert (blkmm (x, single (x)), single (z));
25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	409
25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	410 %!test
25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	411 %! x(:,:,1) = [1 2; 3 4];
25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	412 %! x(:,:,2) = [1i 1i; 1i 1i];
25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	413 %! z(:,:,1) = [7 10; 15 22];
25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	414 %! z(:,:,2) = [-2 -2; -2 -2];
25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	415 %! assert (blkmm (x,x), z);
25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	416 %! assert (blkmm (single (x), single (x)), single (z));
25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	417 %! assert (blkmm (x, single (x)), single (z));
25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	418
25567 8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	419 %!test <*54261>
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	420 %! x = ones (0, 3, 3);
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	421 %! y = ones (3, 5, 3);
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	422 %! z = blkmm (x,y);
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	423 %! assert (size (z), [0, 5, 3]);
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	424 %! x = ones (1, 3, 3);
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	425 %! y = ones (3, 0, 3);
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	426 %! z = blkmm (x,y);
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	427 %! assert (size (z), [1, 0, 3]);
8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	428
22737 7abc25e6206a maint: Clean up code base to follow Octave coding conventions. Rik <rik@octave.org> parents: 22323 diff changeset	429 ## Test input validation
19141 25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	430 %!error blkmm ()
25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	431 %!error blkmm (1)
25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	432 %!error blkmm (1,2,3)
25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	433 %!error <A and B must be numeric> blkmm ({1,2}, [3,4])
25ab600d16fd codesprint: Add %!tests for dot.cc file. Rik <rik@octave.org> parents: 18671 diff changeset	434 %!error <A and B must be numeric> blkmm ([3,4], {1,2})
25567 8c0a35040974 Fix blkmm to work with empty matrices (bug #54261). John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	435 %!error <A and B dimensions don't match> blkmm (ones (2,2), ones (3,3))
12788 9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	436 */
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	437
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	438 OCTAVE_NAMESPACE_END

Mercurial > octave

annotate libinterp/corefcn/dot.cc @ 30723:08b08b7f05b2