octave: libinterp/corefcn/dot.cc annotate

annotate libinterp/corefcn/dot.cc @ 18636:60562e5c8bfb stable

Correctly validate arguments to dot function (bug #42061). * dot.cc (Fdot): Check that lengths of vector arguments are the same. Add input validations tests.

author	Rik <rik@octave.org>
date	Sun, 06 Apr 2014 14:56:45 -0700
parents	175b392e91fe
children	78fac67300e8

rev	line source
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	1 /*
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	2
17744 d63878346099 maint: Update copyright notices for release. John W. Eaton <jwe@octave.org> parents: 15239 diff changeset	3 Copyright (C) 2009-2013 VZLU Prague
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	4
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	5 This file is part of Octave.
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	6
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	8 under the terms of the GNU General Public License as published by the
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	10 option) any later version.
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	11
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	15 for more details.
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	16
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	17 You should have received a copy of the GNU General Public License
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	19 <http://www.gnu.org/licenses/>.
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	20
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	21 */
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	22
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	23 #ifdef HAVE_CONFIG_H
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	24 #include <config.h>
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	25 #endif
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	26
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	27 #include "f77-fcn.h"
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	28 #include "mx-base.h"
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	29 #include "error.h"
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	30 #include "defun.h"
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	31 #include "parse.h"
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	32
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	33 extern "C"
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	34 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	35 F77_RET_T
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	36 F77_FUNC (ddot3, DDOT3) (const octave_idx_type&, const octave_idx_type&,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10846 diff changeset	37 const octave_idx_type&, const double*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10846 diff changeset	38 const double, double);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	39
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	40 F77_RET_T
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	41 F77_FUNC (sdot3, SDOT3) (const octave_idx_type&, const octave_idx_type&,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10846 diff changeset	42 const octave_idx_type&, const float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10846 diff changeset	43 const float, float);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	44
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	45 F77_RET_T
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	46 F77_FUNC (zdotc3, ZDOTC3) (const octave_idx_type&, const octave_idx_type&,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10846 diff changeset	47 const octave_idx_type&, const Complex*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10846 diff changeset	48 const Complex, Complex);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	49
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	50 F77_RET_T
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	51 F77_FUNC (cdotc3, CDOTC3) (const octave_idx_type&, const octave_idx_type&,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10846 diff changeset	52 const octave_idx_type&, const FloatComplex*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10846 diff changeset	53 const FloatComplex, FloatComplex);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	54
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	55 F77_RET_T
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	56 F77_FUNC (dmatm3, DMATM3) (const octave_idx_type&, const octave_idx_type&,
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	57 const octave_idx_type&, const octave_idx_type&,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10846 diff changeset	58 const double, const double, double*);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	59
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	60 F77_RET_T
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	61 F77_FUNC (smatm3, SMATM3) (const octave_idx_type&, const octave_idx_type&,
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	62 const octave_idx_type&, const octave_idx_type&,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10846 diff changeset	63 const float, const float, float*);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	64
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	65 F77_RET_T
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	66 F77_FUNC (zmatm3, ZMATM3) (const octave_idx_type&, const octave_idx_type&,
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	67 const octave_idx_type&, const octave_idx_type&,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10846 diff changeset	68 const Complex, const Complex, Complex*);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	69
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	70 F77_RET_T
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	71 F77_FUNC (cmatm3, CMATM3) (const octave_idx_type&, const octave_idx_type&,
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	72 const octave_idx_type&, const octave_idx_type&,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10846 diff changeset	73 const FloatComplex, const FloatComplex,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10846 diff changeset	74 FloatComplex*);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	75 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	76
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	77 static void
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	78 get_red_dims (const dim_vector& x, const dim_vector& y, int dim,
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	79 dim_vector& z, octave_idx_type& m, octave_idx_type& n,
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	80 octave_idx_type& k)
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	81 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	82 int nd = x.length ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	83 assert (nd == y.length ());
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	84 z = dim_vector::alloc (nd);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	85 m = 1, n = 1, k = 1;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	86 for (int i = 0; i < nd; i++)
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	87 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	88 if (i < dim)
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	89 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	90 z(i) = x(i);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	91 m *= x(i);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	92 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	93 else if (i > dim)
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	94 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	95 z(i) = x(i);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	96 n *= x(i);
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 else
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	99 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	100 k = x(i);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	101 z(i) = 1;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	102 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	103 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	104 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	105
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	106 DEFUN (dot, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	107 "-- texinfo --\n\
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	108 @deftypefn {Built-in Function} {} dot (@var{x}, @var{y}, @var{dim})\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	109 Compute the dot product of two vectors. If @var{x} and @var{y}\n\
12642 f96b9b9f141b doc: Periodic grammarcheck and spellcheck of documentation. Rik <octave@nomad.inbox5.com> parents: 12572 diff changeset	110 are matrices, calculate the dot products along the first\n\
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	111 non-singleton dimension. If the optional argument @var{dim} is\n\
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	112 given, calculate the dot products along this dimension.\n\
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	113 \n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	114 This is equivalent to\n\
10846 a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	115 @code{sum (conj (@var{X}) .* @var{Y}, @var{dim})},\n\
a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	116 but avoids forming a temporary array and is faster. When @var{X} and\n\
a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	117 @var{Y} are column vectors, the result is equivalent to\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	118 @code{@var{X}' * @var{Y}}.\n\
12520 ad05e1547398 Add function chop to documentation. Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	119 @seealso{cross, divergence}\n\
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	120 @end deftypefn")
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	121 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	122 octave_value retval;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	123 int nargin = args.length ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	124
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	125 if (nargin < 2 \|\| nargin > 3)
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	126 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	127 print_usage ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	128 return retval;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	129 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	130
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	131 octave_value argx = args(0), argy = args(1);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	132
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	133 if (argx.is_numeric_type () && argy.is_numeric_type ())
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	134 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	135 dim_vector dimx = argx.dims (), dimy = argy.dims ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	136 bool match = dimx == dimy;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	137 if (! match && nargin == 2
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	138 && dimx.is_vector () && dimy.is_vector ())
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	139 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	140 // Change to column vectors.
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	141 dimx = dimx.redim (1);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	142 argx = argx.reshape (dimx);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	143 dimy = dimy.redim (1);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	144 argy = argy.reshape (dimy);
18636 60562e5c8bfb Correctly validate arguments to dot function (bug #42061). Rik <rik@octave.org> parents: 17787 diff changeset	145 match = ! error_state && (dimx == dimy);
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	146 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	147
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	148 if (match)
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	149 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	150 int dim;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	151 if (nargin == 2)
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	152 dim = dimx.first_non_singleton ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	153 else
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	154 dim = args(2).int_value (true) - 1;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	155
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	156 if (error_state)
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	157 ;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	158 else if (dim < 0)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	159 error ("dot: DIM must be a valid dimension");
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	160 else
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	161 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	162 octave_idx_type m, n, k;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	163 dim_vector dimz;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	164 if (argx.is_complex_type () \|\| argy.is_complex_type ())
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	165 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	166 if (argx.is_single_type () \|\| argy.is_single_type ())
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	167 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	168 FloatComplexNDArray x = argx.float_complex_array_value ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	169 FloatComplexNDArray y = argy.float_complex_array_value ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	170 get_red_dims (dimx, dimy, dim, dimz, m, n, k);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	171 FloatComplexNDArray z(dimz);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	172 if (! error_state)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	173 F77_XFCN (cdotc3, CDOTC3, (m, n, k,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	174 x.data (), y.data (),
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	175 z.fortran_vec ()));
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	176 retval = z;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	177 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	178 else
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	179 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	180 ComplexNDArray x = argx.complex_array_value ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	181 ComplexNDArray y = argy.complex_array_value ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	182 get_red_dims (dimx, dimy, dim, dimz, m, n, k);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	183 ComplexNDArray z(dimz);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	184 if (! error_state)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	185 F77_XFCN (zdotc3, ZDOTC3, (m, n, k,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	186 x.data (), y.data (),
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	187 z.fortran_vec ()));
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	188 retval = z;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	189 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	190 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	191 else if (argx.is_float_type () && argy.is_float_type ())
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	192 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	193 if (argx.is_single_type () \|\| argy.is_single_type ())
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	194 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	195 FloatNDArray x = argx.float_array_value ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	196 FloatNDArray y = argy.float_array_value ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	197 get_red_dims (dimx, dimy, dim, dimz, m, n, k);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	198 FloatNDArray z(dimz);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	199 if (! error_state)
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	200 F77_XFCN (sdot3, SDOT3, (m, n, k, x.data (), y.data (),
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	201 z.fortran_vec ()));
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	202 retval = z;
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 else
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 NDArray x = argx.array_value ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	207 NDArray y = argy.array_value ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	208 get_red_dims (dimx, dimy, dim, dimz, m, n, k);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	209 NDArray z(dimz);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	210 if (! error_state)
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	211 F77_XFCN (ddot3, DDOT3, (m, n, k, x.data (), y.data (),
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	212 z.fortran_vec ()));
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	213 retval = z;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	214 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	215 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	216 else
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	217 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	218 // Non-optimized evaluation.
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	219 octave_value_list tmp;
15239 a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	220 tmp(1) = dim + 1;
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	221 tmp(0) = do_binary_op (octave_value::op_el_mul, argx, argy);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	222 if (! error_state)
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	223 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	224 tmp = feval ("sum", tmp, 1);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	225 if (! tmp.empty ())
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	226 retval = tmp(0);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	227 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	228 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	229 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	230 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	231 else
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	232 error ("dot: sizes of X and Y must match");
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	233
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	234 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	235 else
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	236 error ("dot: X and Y must be numeric");
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	237
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	238 return retval;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	239 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	240
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	241 /*
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	242 %!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	243
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	244 %!test
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	245 %! x = [2, 1; 2, 1];
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	246 %! 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	247 %! assert (dot (x, y), [0 0]);
12788 9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	248
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	249 %!test
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	250 %! 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	251 %! assert (dot (x, x), [4, 20]);
15239 a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	252
a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	253 %!test
a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	254 %! x = int8 ([1 2]);
a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	255 %! y = int8 ([2 3]);
a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	256 %! assert (dot (x, y), 8);
a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	257
a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	258 %!test
a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	259 %! x = int8 ([1 2; 3 4]);
a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	260 %! y = int8 ([5 6; 7 8]);
a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	261 %! assert (dot (x, y), [26 44]);
a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	262 %! assert (dot (x, y, 2), [17; 53]);
a38d5ed5b3d8 dot.cc: Segfault with integers (bug #37199) Max Brister <max@2bass.com> parents: 15195 diff changeset	263 %! 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	264
18636 60562e5c8bfb Correctly validate arguments to dot function (bug #42061). Rik <rik@octave.org> parents: 17787 diff changeset	265 %% Test input validation
60562e5c8bfb Correctly validate arguments to dot function (bug #42061). Rik <rik@octave.org> parents: 17787 diff changeset	266 %!error dot ()
60562e5c8bfb Correctly validate arguments to dot function (bug #42061). Rik <rik@octave.org> parents: 17787 diff changeset	267 %!error dot (1)
60562e5c8bfb Correctly validate arguments to dot function (bug #42061). Rik <rik@octave.org> parents: 17787 diff changeset	268 %!error dot (1,2,3,4)
60562e5c8bfb Correctly validate arguments to dot function (bug #42061). Rik <rik@octave.org> parents: 17787 diff changeset	269 %!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	270 %!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	271 %!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	272 %!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	273 %!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	274 %!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	275 */
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	276
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	277 DEFUN (blkmm, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	278 "-- texinfo --\n\
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	279 @deftypefn {Built-in Function} {} blkmm (@var{A}, @var{B})\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	280 Compute products of matrix blocks. The blocks are given as\n\
12572 dffd30f12752 Add blkmm function to documentation. Rik <octave@nomad.inbox5.com> parents: 12520 diff changeset	281 2-dimensional subarrays of the arrays @var{A}, @var{B}.\n\
dffd30f12752 Add blkmm function to documentation. Rik <octave@nomad.inbox5.com> parents: 12520 diff changeset	282 The size of @var{A} must have the form @code{[m,k,@dots{}]} and\n\
dffd30f12752 Add blkmm function to documentation. Rik <octave@nomad.inbox5.com> parents: 12520 diff changeset	283 size of @var{B} must be @code{[k,n,@dots{}]}. The result is\n\
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	284 then of size @code{[m,n,@dots{}]} and is computed as follows:\n\
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	285 \n\
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	286 @example\n\
10711 fbd7843974fa Periodic grammar check of documentation files to ensure common format. Rik <octave@nomad.inbox5.com> parents: 10155 diff changeset	287 @group\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	288 for i = 1:prod (size (@var{A})(3:end))\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	289 @var{C}(:,:,i) = @var{A}(:,:,i) * @var{B}(:,:,i)\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	290 endfor\n\
10711 fbd7843974fa Periodic grammar check of documentation files to ensure common format. Rik <octave@nomad.inbox5.com> parents: 10155 diff changeset	291 @end group\n\
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	292 @end example\n\
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	293 @end deftypefn")
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	294 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	295 octave_value retval;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	296 int nargin = args.length ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	297
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	298 if (nargin != 2)
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	299 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	300 print_usage ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	301 return retval;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	302 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	303
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	304 octave_value argx = args(0), argy = args(1);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	305
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	306 if (argx.is_numeric_type () && argy.is_numeric_type ())
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	307 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	308 const dim_vector dimx = argx.dims (), dimy = argy.dims ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	309 int nd = dimx.length ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	310 octave_idx_type m = dimx(0), k = dimx(1), n = dimy(1), np = 1;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	311 bool match = dimy(0) == k && nd == dimy.length ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	312 dim_vector dimz = dim_vector::alloc (nd);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	313 dimz(0) = m;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	314 dimz(1) = n;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	315 for (int i = 2; match && i < nd; i++)
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	316 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	317 match = match && dimx(i) == dimy(i);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	318 dimz(i) = dimx(i);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	319 np *= dimz(i);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	320 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	321
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	322 if (match)
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	323 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	324 if (argx.is_complex_type () \|\| argy.is_complex_type ())
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	325 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	326 if (argx.is_single_type () \|\| argy.is_single_type ())
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	327 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	328 FloatComplexNDArray x = argx.float_complex_array_value ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	329 FloatComplexNDArray y = argy.float_complex_array_value ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	330 FloatComplexNDArray z(dimz);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	331 if (! error_state)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	332 F77_XFCN (cmatm3, CMATM3, (m, n, k, np,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	333 x.data (), y.data (),
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	334 z.fortran_vec ()));
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	335 retval = z;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	336 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	337 else
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	338 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	339 ComplexNDArray x = argx.complex_array_value ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	340 ComplexNDArray y = argy.complex_array_value ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	341 ComplexNDArray z(dimz);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	342 if (! error_state)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	343 F77_XFCN (zmatm3, ZMATM3, (m, n, k, np,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	344 x.data (), y.data (),
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	345 z.fortran_vec ()));
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	346 retval = z;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	347 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	348 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	349 else
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	350 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	351 if (argx.is_single_type () \|\| argy.is_single_type ())
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	352 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	353 FloatNDArray x = argx.float_array_value ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	354 FloatNDArray y = argy.float_array_value ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	355 FloatNDArray z(dimz);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	356 if (! error_state)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	357 F77_XFCN (smatm3, SMATM3, (m, n, k, np,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	358 x.data (), y.data (),
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	359 z.fortran_vec ()));
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	360 retval = z;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	361 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	362 else
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	363 {
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	364 NDArray x = argx.array_value ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	365 NDArray y = argy.array_value ();
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	366 NDArray z(dimz);
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	367 if (! error_state)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	368 F77_XFCN (dmatm3, DMATM3, (m, n, k, np,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	369 x.data (), y.data (),
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	370 z.fortran_vec ()));
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	371 retval = z;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	372 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	373 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	374 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	375 else
12572 dffd30f12752 Add blkmm function to documentation. Rik <octave@nomad.inbox5.com> parents: 12520 diff changeset	376 error ("blkmm: A and B dimensions don't match: (%s) and (%s)",
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	377 dimx.str ().c_str (), dimy.str ().c_str ());
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	378
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	379 }
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	380 else
12572 dffd30f12752 Add blkmm function to documentation. Rik <octave@nomad.inbox5.com> parents: 12520 diff changeset	381 error ("blkmm: A and B must be numeric");
9874 90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	382
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	383 return retval;
90bc0cc4518f implement compiled dot and blkmm Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	384 }
12788 9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	385
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	386 /*
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	387 %!test
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	388 %! x(:,:,1) = [1 2; 3 4];
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	389 %! x(:,:,2) = [1 1; 1 1];
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	390 %! z(:,:,1) = [7 10; 15 22];
9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	391 %! 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	392 %! assert (blkmm (x,x), z);
12788 9f4b48b93f6d codesprint: Write test for dot.cc Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12642 diff changeset	393 */

Mercurial > octave

annotate libinterp/corefcn/dot.cc @ 18636:60562e5c8bfb stable