octave-nkf: liboctave/bsxfun-defs.cc annotate

annotate liboctave/bsxfun-defs.cc @ 13139:aa4a23337a0f

Enable BSX in-place for missing assignment operators * bsxfun-defs.cc (do_inplace_bsxfun_op): New function. * bsxfun.h (is_valid_bsxfun): Fix logic, had bug with empty dimensions. (is_valid_inplace_bsxfun): New function. * mx-inlines.cc (DEFMXBOOLOPEQ): Add missing function for vector-by-scalar operation. (do_mm_inplace_op): Call new inplace_bsxfun functions. * MArray.cc (MArray::operator+, MArray::operator-, MArray::product_eq, MArray::quotient_eq): Change calling form for do_mm_in_place_op. * boolNDArray.cc (boolNDArray::mx_el_and_assign, boolNDArray::mx_el_or_assign): Ditto

author	Jordi Gutiérrez Hermoso <jordigh@octave.org>
date	Thu, 15 Sep 2011 05:11:46 -0500
parents	15eefbd9d4e8
children	782dc237a02d

rev	line source
9747 7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	1 /*
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	2
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 10362 diff changeset	3 Copyright (C) 2009-2011 Jaroslav Hajek
9747 7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	4 Copyright (C) 2009 VZLU Prague
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	5
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	6 This file is part of Octave.
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	7
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	9 under the terms of the GNU General Public License as published by the
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	11 option) any later version.
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	12
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	16 for more details.
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	17
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	18 You should have received a copy of the GNU General Public License
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	19 along with Octave; see the file COPYING. If not, see
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	20 <http://www.gnu.org/licenses/>.
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	21
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	22 */
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	23
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	24 #if !defined (octave_bsxfun_defs_h)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	25 #define octave_bsxfun_defs_h 1
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	26
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	27 #include <algorithm>
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	28 #include <iostream>
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	29
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	30 #include "dim-vector.h"
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	31 #include "oct-locbuf.h"
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	32 #include "lo-error.h"
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	33
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	34 #include "mx-inlines.cc"
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	35
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10142 diff changeset	36 template <class R, class X, class Y>
b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10142 diff changeset	37 Array<R>
b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10142 diff changeset	38 do_bsxfun_op (const Array<X>& x, const Array<Y>& y,
b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10142 diff changeset	39 void (op_vv) (size_t, R , const X , const Y ),
b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10142 diff changeset	40 void (op_sv) (size_t, R , X, const Y *),
b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10142 diff changeset	41 void (op_vs) (size_t, R , const X *, Y))
9747 7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	42 {
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	43 int nd = std::max (x.ndims (), y.ndims ());
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	44 dim_vector dvx = x.dims ().redim (nd), dvy = y.dims ().redim (nd);
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	45
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	46 // Construct the result dimensions.
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	47 dim_vector dvr;
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	48 dvr.resize (nd);
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	49 for (int i = 0; i < nd; i++)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	50 {
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	51 octave_idx_type xk = dvx(i), yk = dvy(i);
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	52 if (xk == 1)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	53 dvr(i) = yk;
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	54 else if (yk == 1 \|\| xk == yk)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	55 dvr(i) = xk;
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	56 else
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	57 {
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	58 (*current_liboctave_error_handler)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	59 ("bsxfun: nonconformant dimensions: %s and %s",
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	60 x.dims ().str ().c_str (), y.dims ().str ().c_str ());
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	61 break;
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	62 }
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	63 }
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	64
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10142 diff changeset	65 Array<R> retval (dvr);
9747 7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	66
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10142 diff changeset	67 const X *xvec = x.fortran_vec ();
b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10142 diff changeset	68 const Y *yvec = y.fortran_vec ();
b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10142 diff changeset	69 R *rvec = retval.fortran_vec ();
9747 7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	70
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	71 // Fold the common leading dimensions.
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	72 int start;
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	73 octave_idx_type ldr = 1;
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	74 for (start = 0; start < nd; start++)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	75 {
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	76 if (dvx(start) != dvy(start))
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	77 break;
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	78 ldr *= dvr(start);
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	79 }
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	80
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	81 if (retval.is_empty ())
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	82 ; // do nothing
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	83 else if (start == nd)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	84 op_vv (retval.numel (), rvec, xvec, yvec);
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	85 else
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	86 {
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	87 // Determine the type of the low-level loop.
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	88 bool xsing = false, ysing = false;
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	89 if (ldr == 1)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	90 {
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	91 xsing = dvx(start) == 1;
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	92 ysing = dvy(start) == 1;
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	93 if (xsing \|\| ysing)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	94 {
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	95 ldr = dvx(start) dvy(start);
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	96 start++;
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	97 }
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	98 }
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	99 dim_vector cdvx = dvx.cumulative (), cdvy = dvy.cumulative ();
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	100 // Nullify singleton dims to achieve a spread effect.
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	101 for (int i = std::max (start, 1); i < nd; i++)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	102 {
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	103 if (dvx(i) == 1)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	104 cdvx(i-1) = 0;
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	105 if (dvy(i) == 1)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	106 cdvy(i-1) = 0;
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	107 }
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	108
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	109 octave_idx_type niter = dvr.numel (start);
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	110 // The index array.
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	111 OCTAVE_LOCAL_BUFFER_INIT (octave_idx_type, idx, nd, 0);
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	112 for (octave_idx_type iter = 0; iter < niter; iter++)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	113 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 10140 diff changeset	114 octave_quit ();
9827 c15a5ed0da58 optimize bsxfun (@power, ...) Jaroslav Hajek <highegg@gmail.com> parents: 9747 diff changeset	115
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	116 // Compute indices.
9747 7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	117 // FIXME: performance impact noticeable?
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	118 octave_idx_type xidx = cdvx.cum_compute_index (idx);
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	119 octave_idx_type yidx = cdvy.cum_compute_index (idx);
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	120 octave_idx_type ridx = dvr.compute_index (idx);
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	121
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	122 // Apply the low-level loop.
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	123 if (xsing)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	124 op_sv (ldr, rvec + ridx, xvec[xidx], yvec + yidx);
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	125 else if (ysing)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	126 op_vs (ldr, rvec + ridx, xvec + xidx, yvec[yidx]);
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	127 else
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	128 op_vv (ldr, rvec + ridx, xvec + xidx, yvec + yidx);
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	129
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	130 dvr.increment_index (idx + start, start);
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	131 }
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	132 }
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	133
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	134 return retval;
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	135 }
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	136
13139 aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	137 template <class R, class X>
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	138 void
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	139 do_inplace_bsxfun_op (Array<R>& r, const Array<X>& x,
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	140 void (op_vv) (size_t, R , const X *),
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	141 void (op_vs) (size_t, R , X))
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	142 {
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	143 dim_vector dvr = r.dims (), dvx = x.dims ();
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	144 octave_idx_type nd = r.ndims ();
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	145 dvx.redim (nd);
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	146
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	147 const X* xvec = x.fortran_vec ();
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	148 R* rvec = r.fortran_vec ();
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	149
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	150 // Fold the common leading dimensions.
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	151 octave_idx_type start, ldr = 1;
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	152 for (start = 0; start < nd; start++)
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	153 {
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	154 if (dvr(start) != dvx(start))
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	155 break;
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	156 ldr *= dvr(start);
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	157 }
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	158
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	159 if (r.is_empty ())
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	160 ; // do nothing
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	161 else if (start == nd)
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	162 op_vv (r.numel (), rvec, xvec);
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	163 else
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	164 {
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	165 // Determine the type of the low-level loop.
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	166 bool xsing = false;
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	167 if (ldr == 1)
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	168 {
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	169 xsing = dvx(start) == 1;
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	170 if (xsing)
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	171 {
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	172 ldr = dvr(start) dvx(start);
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	173 start++;
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	174 }
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	175 }
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	176
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	177 dim_vector cdvx = dvx.cumulative ();
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	178 // Nullify singleton dims to achieve a spread effect.
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	179 for (int i = std::max (start, 1); i < nd; i++)
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	180 {
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	181 if (dvx(i) == 1)
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	182 cdvx(i-1) = 0;
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	183 }
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	184
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	185 octave_idx_type niter = dvr.numel (start);
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	186 // The index array.
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	187 OCTAVE_LOCAL_BUFFER_INIT (octave_idx_type, idx, nd, 0);
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	188 for (octave_idx_type iter = 0; iter < niter; iter++)
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	189 {
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	190 octave_quit ();
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	191
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	192 // Compute indices.
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	193 // FIXME: performance impact noticeable?
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	194 octave_idx_type xidx = cdvx.cum_compute_index (idx);
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	195 octave_idx_type ridx = dvr.compute_index (idx);
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	196
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	197 // Apply the low-level loop.
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	198 if (xsing)
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	199 op_vs (ldr, rvec + ridx, xvec[xidx]);
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	200 else
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	201 op_vv (ldr, rvec + ridx, xvec + xidx);
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	202
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	203 dvr.increment_index (idx + start, start);
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	204 }
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	205 }
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	206 }
aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13012 diff changeset	207
9747 7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	208 #define BSXFUN_OP_DEF(OP, ARRAY) \
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	209 ARRAY bsxfun_ ## OP (const ARRAY& x, const ARRAY& y)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	210
9827 c15a5ed0da58 optimize bsxfun (@power, ...) Jaroslav Hajek <highegg@gmail.com> parents: 9747 diff changeset	211 #define BSXFUN_OP2_DEF(OP, ARRAY, ARRAY1, ARRAY2) \
c15a5ed0da58 optimize bsxfun (@power, ...) Jaroslav Hajek <highegg@gmail.com> parents: 9747 diff changeset	212 ARRAY bsxfun_ ## OP (const ARRAY1& x, const ARRAY2& y)
c15a5ed0da58 optimize bsxfun (@power, ...) Jaroslav Hajek <highegg@gmail.com> parents: 9747 diff changeset	213
9747 7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	214 #define BSXFUN_REL_DEF(OP, ARRAY) \
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	215 boolNDArray bsxfun_ ## OP (const ARRAY& x, const ARRAY& y)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	216
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	217 #define BSXFUN_OP_DEF_MXLOOP(OP, ARRAY, LOOP) \
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	218 BSXFUN_OP_DEF(OP, ARRAY) \
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10142 diff changeset	219 { return do_bsxfun_op<ARRAY::element_type, ARRAY::element_type, ARRAY::element_type> \
b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10142 diff changeset	220 (x, y, LOOP, LOOP, LOOP); }
9747 7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	221
9827 c15a5ed0da58 optimize bsxfun (@power, ...) Jaroslav Hajek <highegg@gmail.com> parents: 9747 diff changeset	222 #define BSXFUN_OP2_DEF_MXLOOP(OP, ARRAY, ARRAY1, ARRAY2, LOOP) \
c15a5ed0da58 optimize bsxfun (@power, ...) Jaroslav Hajek <highegg@gmail.com> parents: 9747 diff changeset	223 BSXFUN_OP2_DEF(OP, ARRAY, ARRAY1, ARRAY2) \
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10142 diff changeset	224 { return do_bsxfun_op<ARRAY::element_type, ARRAY1::element_type, ARRAY2::element_type> \
b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10142 diff changeset	225 (x, y, LOOP, LOOP, LOOP); }
9827 c15a5ed0da58 optimize bsxfun (@power, ...) Jaroslav Hajek <highegg@gmail.com> parents: 9747 diff changeset	226
9747 7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	227 #define BSXFUN_REL_DEF_MXLOOP(OP, ARRAY, LOOP) \
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	228 BSXFUN_REL_DEF(OP, ARRAY) \
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10142 diff changeset	229 { return do_bsxfun_op<bool, ARRAY::element_type, ARRAY::element_type> \
b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10142 diff changeset	230 (x, y, LOOP, LOOP, LOOP); }
9747 7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	231
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	232 #define BSXFUN_STDOP_DEFS_MXLOOP(ARRAY) \
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	233 BSXFUN_OP_DEF_MXLOOP (add, ARRAY, mx_inline_add) \
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	234 BSXFUN_OP_DEF_MXLOOP (sub, ARRAY, mx_inline_sub) \
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	235 BSXFUN_OP_DEF_MXLOOP (mul, ARRAY, mx_inline_mul) \
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	236 BSXFUN_OP_DEF_MXLOOP (div, ARRAY, mx_inline_div) \
10140 36ea14c8992d fix reversed min/max in bsxfun Jaroslav Hajek <highegg@gmail.com> parents: 9827 diff changeset	237 BSXFUN_OP_DEF_MXLOOP (min, ARRAY, mx_inline_xmin) \
36ea14c8992d fix reversed min/max in bsxfun Jaroslav Hajek <highegg@gmail.com> parents: 9827 diff changeset	238 BSXFUN_OP_DEF_MXLOOP (max, ARRAY, mx_inline_xmax) \
9747 7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	239
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	240 #define BSXFUN_STDREL_DEFS_MXLOOP(ARRAY) \
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	241 BSXFUN_REL_DEF_MXLOOP (eq, ARRAY, mx_inline_eq) \
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	242 BSXFUN_REL_DEF_MXLOOP (ne, ARRAY, mx_inline_ne) \
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	243 BSXFUN_REL_DEF_MXLOOP (lt, ARRAY, mx_inline_lt) \
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	244 BSXFUN_REL_DEF_MXLOOP (le, ARRAY, mx_inline_le) \
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	245 BSXFUN_REL_DEF_MXLOOP (gt, ARRAY, mx_inline_gt) \
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	246 BSXFUN_REL_DEF_MXLOOP (ge, ARRAY, mx_inline_ge)
7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	247
13012 15eefbd9d4e8 Implement a few missing automatic bsxfun power operators Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	248 //For bsxfun power with mixed integer/float types
15eefbd9d4e8 Implement a few missing automatic bsxfun power operators Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	249 #define BSXFUN_POW_MIXED_MXLOOP(INT_TYPE) \
15eefbd9d4e8 Implement a few missing automatic bsxfun power operators Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	250 BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, INT_TYPE, NDArray, mx_inline_pow) \
15eefbd9d4e8 Implement a few missing automatic bsxfun power operators Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	251 BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, INT_TYPE, FloatNDArray, mx_inline_pow)\
15eefbd9d4e8 Implement a few missing automatic bsxfun power operators Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	252 BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, NDArray, INT_TYPE, mx_inline_pow) \
15eefbd9d4e8 Implement a few missing automatic bsxfun power operators Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	253 BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, FloatNDArray, INT_TYPE, mx_inline_pow)
15eefbd9d4e8 Implement a few missing automatic bsxfun power operators Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	254
9747 7bda650b691a add omitted files from 26abff55f6fe Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	255 #endif

Mercurial > octave-nkf

annotate liboctave/bsxfun-defs.cc @ 13139:aa4a23337a0f