octave: liboctave/util/oct-binmap.h annotate

annotate liboctave/util/oct-binmap.h @ 21100:e39e05d90788

Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. * libinterp/corefcn/errwarn.h, libinterp/corefcn/errwarn.cc: New header and .cc file with common errors and warnings for libinterp. * libinterp/corefcn/module.mk: Add errwarn.h, errwarn.cc to build system. * liboctave/util/lo-array-errwarn.h, liboctave/util/lo-array-errwarn.cc: New header and .cc file with common errors and warnings for liboctave. * liboctave/util/module.mk: Add lo-array-errwarn.h, lo-array-errwarn.cc to build system. * lo-array-gripes.h: #include "lo-array-errwarn.h" for access to class index_exception. Remove const char *error_id_XXX prototypes. * lo-array-gripes.cc: Remove const char *error_id_XXX initializations. Remove index_exception method definitions. * Cell.cc, __pchip_deriv__.cc, __qp__.cc, balance.cc, betainc.cc, cellfun.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, defaults.cc, det.cc, dirfns.cc, eig.cc, fft.cc, fft2.cc, fftn.cc, find.cc, gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, graphics.in.h, help.cc, hess.cc, hex2num.cc, input.cc, inv.cc, jit-typeinfo.cc, load-save.cc, lookup.cc, ls-hdf5.cc, ls-mat-ascii.cc, ls-mat4.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc, lsode.cc, lu.cc, luinc.cc, max.cc, mgorth.cc, oct-hist.cc, oct-procbuf.cc, oct-stream.cc, oct.h, pager.cc, pinv.cc, pr-output.cc, quad.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, sparse-xdiv.cc, sparse-xpow.cc, sparse.cc, spparms.cc, sqrtm.cc, str2double.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, syscalls.cc, typecast.cc, utils.cc, variables.cc, xdiv.cc, xnorm.cc, xpow.cc, __eigs__.cc, __glpk__.cc, __magick_read__.cc, __osmesa_print__.cc, audiodevinfo.cc, audioread.cc, chol.cc, dmperm.cc, fftw.cc, qr.cc, symbfact.cc, symrcm.cc, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc, ov-base-scalar.cc, ov-base-sparse.cc, ov-base.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.cc, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-complex.cc, ov-complex.h, ov-cs-list.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-intx.h, ov-mex-fcn.cc, ov-perm.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-struct.cc, ov-type-conv.h, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc, ov.cc, op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.cc, op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-dms-template.cc, op-double-conv.cc, op-fcdm-fcdm.cc, op-fcdm-fdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-float-conv.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc, op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc, op-int-conv.cc, op-int.h, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.cc, ops.h, lex.ll, pt-assign.cc, pt-eval.cc, pt-idx.cc, pt-loop.cc, pt-mat.cc, pt-stmt.cc, Array-util.cc, Array-util.h, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CRowVector.cc, CSparse.cc, DiagArray2.cc, MDiagArray2.cc, MSparse.cc, PermMatrix.cc, Range.cc, Sparse.cc, dColVector.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fColVector.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc, idx-vector.cc, CmplxGEPBAL.cc, dbleGEPBAL.cc, fCmplxGEPBAL.cc, floatGEPBAL.cc, Sparse-diag-op-defs.h, Sparse-op-defs.h, Sparse-perm-op-defs.h, mx-inlines.cc, mx-op-defs.h, oct-binmap.h: Replace 'include "gripes.h"' with 'include "errwarn.h". Change all gripe_XXX to err_XXX or warn_XXX or errwarn_XXX.

author	Rik <rik@octave.org>
date	Mon, 18 Jan 2016 18:28:06 -0800
parents	f7084eae3318
children	3ac9f47fb04b

rev	line source
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	1 /*
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	2
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19381 diff changeset	3 Copyright (C) 2010-2015 VZLU Prague
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	4
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	5 This file is part of Octave.
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	6
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	8 under the terms of the GNU General Public License as published by the
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	10 option) any later version.
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	11
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	15 for more details.
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	16
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	17 You should have received a copy of the GNU General Public License
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	19 <http://www.gnu.org/licenses/>.
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	20
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	21 */
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	22
20791 f7084eae3318 maint: Use Octave coding conventions for #if statements. Rik <rik@octave.org> parents: 19697 diff changeset	23 #if ! defined (octave_oct_binmap_h)
17822 ebb3ef964372 maint: Use common #define syntax "octave_filename_h" in h_files. Rik <rik@octave.org> parents: 17769 diff changeset	24 #define octave_oct_binmap_h 1
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	25
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	26 #include "Array.h"
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	27 #include "Sparse.h"
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	28 #include "Array-util.h"
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	29
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	30 #include "bsxfun.h"
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	31
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	32 // This source file implements a general binary maping function for
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	33 // arrays. The syntax is binmap<type> (a, b, f,[name]). type denotes
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	34 // the expected return type of the operation. a, b, should be one of
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	35 // the 6 combinations:
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	36 //
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	37 // Array-Array
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	38 // Array-scalar
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	39 // scalar-Array
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	40 // Sparse-Sparse
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	41 // Sparse-scalar
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	42 // scalar-Sparse
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	43 //
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	44 // If both operands are nonscalar, name must be supplied. It is used
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	45 // as the base for error message when operands are nonconforming.
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	46 //
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	47 // The operation needs not be homogeneous, i.e. a, b and the result
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	48 // may be of distinct types. f can have any of the four signatures:
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	49 //
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	50 // U f (T, R)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	51 // U f (const T&, R)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	52 // U f (T, const R&)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	53 // U f (const T&, const R&)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	54 //
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	55 // Additionally, f can be an arbitrary functor object.
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	56 //
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	57 // octave_quit() is called at appropriate places, hence the operation
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	58 // is breakable.
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	59
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	60 // The following template wrappers are provided for automatic bsxfun
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	61 // calls (see the function signature for do_bsxfun_op).
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	62
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	63 template<typename R, typename X, typename Y, typename F>
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	64 class bsxfun_wrapper
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	65 {
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	66 private:
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	67 static F f;
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	68
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	69 public:
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	70 static void
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	71 set_f (const F& f_in)
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	72 {
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	73 f = f_in;
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	74 }
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	75
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	76 static void
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	77 op_mm (size_t n, R* r, const X* x , const Y* y)
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	78 {
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	79 for (size_t i = 0; i < n; i++)
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	80 r[i] = f (x[i], y[i]);
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	81 }
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	82
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	83 static void
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	84 op_sm (size_t n, R* r, X x, const Y* y)
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	85 {
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	86 for (size_t i = 0; i < n; i++)
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	87 r[i] = f (x, y[i]);
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	88 }
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	89
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	90 static void
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	91 op_ms (size_t n , R* r, const X* x, Y y)
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	92 {
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	93 for (size_t i = 0; i < n; i++)
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	94 r[i] = f (x[i], y);
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	95 }
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	96 };
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	97
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	98 // Static init
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	99 template<typename R, typename X, typename Y, typename F>
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	100 F bsxfun_wrapper<R, X, Y, F>::f;
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	101
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	102
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	103 // scalar-Array
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	104 template <class U, class T, class R, class F>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	105 Array<U>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	106 binmap (const T& x, const Array<R>& ya, F fcn)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	107 {
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	108 octave_idx_type len = ya.numel ();
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	109
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	110 const R *y = ya.data ();
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	111
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	112 Array<U> result (ya.dims ());
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	113 U *p = result.fortran_vec ();
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	114
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	115 octave_idx_type i;
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	116 for (i = 0; i < len - 3; i += 4)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	117 {
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	118 octave_quit ();
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	119
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	120 p[i] = fcn (x, y[i]);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	121 p[i+1] = fcn (x, y[i+1]);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	122 p[i+2] = fcn (x, y[i+2]);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	123 p[i+3] = fcn (x, y[i+3]);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	124 }
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	125
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	126 octave_quit ();
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	127
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	128 for (; i < len; i++)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	129 p[i] = fcn (x, y[i]);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	130
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	131 return result;
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	132 }
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	133
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	134 // Array-scalar
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	135 template <class U, class T, class R, class F>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	136 Array<U>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	137 binmap (const Array<T>& xa, const R& y, F fcn)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	138 {
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	139 octave_idx_type len = xa.numel ();
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	140
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	141 const R *x = xa.data ();
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	142
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	143 Array<U> result (xa.dims ());
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	144 U *p = result.fortran_vec ();
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	145
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	146 octave_idx_type i;
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	147 for (i = 0; i < len - 3; i += 4)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	148 {
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	149 octave_quit ();
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	150
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	151 p[i] = fcn (x[i], y);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	152 p[i+1] = fcn (x[i+1], y);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	153 p[i+2] = fcn (x[i+2], y);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	154 p[i+3] = fcn (x[i+3], y);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	155 }
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	156
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	157 octave_quit ();
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	158
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	159 for (; i < len; i++)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	160 p[i] = fcn (x[i], y);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	161
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	162 return result;
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	163 }
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	164
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	165 // Array-Array (treats singletons as scalars)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	166 template <class U, class T, class R, class F>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	167 Array<U>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	168 binmap (const Array<T>& xa, const Array<R>& ya, F fcn, const char *name)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	169 {
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 17822 diff changeset	170 dim_vector xad = xa.dims ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 17822 diff changeset	171 dim_vector yad = ya.dims ();
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	172 if (xa.numel () == 1)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	173 return binmap<U, T, R, F> (xa(0), ya, fcn);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	174 else if (ya.numel () == 1)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	175 return binmap<U, T, R, F> (xa, ya(0), fcn);
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	176 else if (xad != yad)
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	177 {
14056 c3d401562410 allow warning (or error) for automatic bsxfun John W. Eaton <jwe@octave.org> parents: 13006 diff changeset	178 if (is_valid_bsxfun (name, xad, yad))
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	179 {
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	180 bsxfun_wrapper<U, T, R, F>::set_f(fcn);
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	181 return do_bsxfun_op (xa, ya,
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	182 bsxfun_wrapper<U, T, R, F>::op_mm,
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	183 bsxfun_wrapper<U, T, R, F>::op_sm,
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	184 bsxfun_wrapper<U, T, R, F>::op_ms);
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	185 }
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	186 else
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 20791 diff changeset	187 err_nonconformant (name, xad, yad);
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	188 }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	189
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	190 octave_idx_type len = xa.numel ();
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	191
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	192 const T *x = xa.data ();
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	193 const T *y = ya.data ();
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	194
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	195 Array<U> result (xa.dims ());
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	196 U *p = result.fortran_vec ();
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	197
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	198 octave_idx_type i;
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	199 for (i = 0; i < len - 3; i += 4)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	200 {
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	201 octave_quit ();
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	202
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	203 p[i] = fcn (x[i], y[i]);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	204 p[i+1] = fcn (x[i+1], y[i+1]);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	205 p[i+2] = fcn (x[i+2], y[i+2]);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	206 p[i+3] = fcn (x[i+3], y[i+3]);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	207 }
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	208
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	209 octave_quit ();
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	210
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	211 for (; i < len; i++)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	212 p[i] = fcn (x[i], y[i]);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	213
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	214 return result;
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	215 }
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	216
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	217 // scalar-Sparse
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	218 template <class U, class T, class R, class F>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	219 Sparse<U>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	220 binmap (const T& x, const Sparse<R>& ys, F fcn)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	221 {
18789 dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	222 R yzero = R ();
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	223 U fz = fcn (x, yzero);
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	224
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	225 if (fz == U ()) // Sparsity preserving fcn
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	226 {
18789 dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	227 octave_idx_type nz = ys.nnz ();
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	228 Sparse<U> retval (ys.rows (), ys.cols (), nz);
19381 af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 18791 diff changeset	229 std::copy (ys.ridx (), ys.ridx () + nz, retval.ridx ());
af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 18791 diff changeset	230 std::copy (ys.cidx (), ys.cidx () + ys.cols () + 1, retval.cidx ());
18789 dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	231
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	232 for (octave_idx_type i = 0; i < nz; i++)
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	233 {
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	234 octave_quit ();
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	235 // FIXME: Could keep track of whether fcn call results in a 0.
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	236 // If no zeroes are created could skip maybe_compress()
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	237 retval.xdata (i) = fcn (x, ys.data (i));
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	238 }
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	239
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	240 octave_quit ();
18789 dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	241 retval.maybe_compress (true);
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	242 return retval;
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	243 }
18789 dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	244 else
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	245 return Sparse<U> (binmap<U, T, R, F> (x, ys.array_value (), fcn));
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	246 }
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	247
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	248 // Sparse-scalar
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	249 template <class U, class T, class R, class F>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	250 Sparse<U>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	251 binmap (const Sparse<T>& xs, const R& y, F fcn)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	252 {
18789 dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	253 T xzero = T ();
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	254 U fz = fcn (xzero, y);
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	255
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	256 if (fz == U ()) // Sparsity preserving fcn
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	257 {
18789 dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	258 octave_idx_type nz = xs.nnz ();
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	259 Sparse<U> retval (xs.rows (), xs.cols (), nz);
19381 af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 18791 diff changeset	260 std::copy (xs.ridx (), xs.ridx () + nz, retval.ridx ());
af41e41ad28e replace oct-mem.h inline indirections by standard function calls. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 18791 diff changeset	261 std::copy (xs.cidx (), xs.cidx () + xs.cols () + 1, retval.cidx ());
18789 dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	262
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	263 for (octave_idx_type i = 0; i < nz; i++)
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	264 {
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	265 octave_quit ();
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	266 // FIXME: Could keep track of whether fcn call results in a 0.
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	267 // If no zeroes are created could skip maybe_compress()
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	268 retval.xdata (i) = fcn (xs.data (i), y);
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	269 }
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	270
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	271 octave_quit ();
18789 dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	272 retval.maybe_compress (true);
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	273 return retval;
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	274 }
18789 dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	275 else
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	276 return Sparse<U> (binmap<U, T, R, F> (xs.array_value (), y, fcn));
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	277 }
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	278
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	279 // Sparse-Sparse (treats singletons as scalars)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	280 template <class U, class T, class R, class F>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	281 Sparse<U>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	282 binmap (const Sparse<T>& xs, const Sparse<R>& ys, F fcn, const char *name)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	283 {
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	284 if (xs.rows () == 1 && xs.cols () == 1)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	285 return binmap<U, T, R, F> (xs(0,0), ys, fcn);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	286 else if (ys.rows () == 1 && ys.cols () == 1)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	287 return binmap<U, T, R, F> (xs, ys(0,0), fcn);
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	288 else if (xs.dims () != ys.dims ())
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 20791 diff changeset	289 err_nonconformant (name, xs.dims (), ys.dims ());
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	290
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	291 T xzero = T ();
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	292 R yzero = R ();
18788 658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	293 U fz = fcn (xzero, yzero);
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	294
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	295 if (fz == U ())
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	296 {
18788 658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	297 // Sparsity-preserving function. Do it efficiently.
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	298 octave_idx_type nr = xs.rows ();
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	299 octave_idx_type nc = xs.cols ();
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	300 Sparse<T> retval (nr, nc, xs.nnz () + ys.nnz ());
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	301
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	302 octave_idx_type nz = 0;
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	303 for (octave_idx_type j = 0; j < nc; j++)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	304 {
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	305 octave_quit ();
18788 658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	306
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	307 octave_idx_type jx = xs.cidx (j);
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	308 octave_idx_type jx_max = xs.cidx (j+1);
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	309 bool jx_lt_max = jx < jx_max;
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	310
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	311 octave_idx_type jy = ys.cidx (j);
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	312 octave_idx_type jy_max = ys.cidx (j+1);
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	313 bool jy_lt_max = jy < jy_max;
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	314
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	315 while (jx_lt_max \|\| jy_lt_max)
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	316 {
18788 658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	317 if (! jy_lt_max
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	318 \|\| (jx_lt_max && (xs.ridx (jx) < ys.ridx (jy))))
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	319 {
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	320 retval.xridx (nz) = xs.ridx (jx);
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	321 retval.xdata (nz) = fcn (xs.data (jx), yzero);
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	322 jx++;
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	323 jx_lt_max = jx < jx_max;
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	324 }
18789 dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	325 else if (! jx_lt_max
dccbc8bff5cb Fix binmap for sparse-scalar or scalar-sparse operations (bug #40813). Rik <rik@octave.org> parents: 18788 diff changeset	326 \|\| (jy_lt_max && (ys.ridx (jy) < xs.ridx (jx))))
18788 658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	327 {
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	328 retval.xridx (nz) = ys.ridx (jy);
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	329 retval.xdata (nz) = fcn (xzero, ys.data (jy));
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	330 jy++;
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	331 jy_lt_max = jy < jy_max;
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	332 }
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	333 else
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	334 {
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	335 retval.xridx (nz) = xs.ridx (jx);
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	336 retval.xdata (nz) = fcn (xs.data (jx), ys.data (jy));
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	337 jx++;
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	338 jx_lt_max = jx < jx_max;
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	339 jy++;
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	340 jy_lt_max = jy < jy_max;
658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	341 }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	342 nz++;
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	343 }
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	344 retval.xcidx (j+1) = nz;
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	345 }
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	346
18788 658d23da2c46 Fix infinite loop and segfault for atan2, fmod, hypot (bug #40813). Stefan Mahr <dac922@gmx.de> parents: 17822 diff changeset	347 retval.maybe_compress (true);
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	348 return retval;
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	349 }
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	350 else
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	351 return Sparse<U> (binmap<U, T, R, F> (xs.array_value (), ys.array_value (),
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	352 fcn, name));
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	353 }
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	354
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	355 // Overloads for function pointers.
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	356
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	357 // Signature (T, R)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	358
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	359 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	360 inline Array<U>
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	361 binmap (const Array<T>& xa, const Array<R>& ya, U (*fcn) (T, R),
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	362 const char *name)
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	363 { return binmap<U, T, R, U (*) (T, R)> (xa, ya, fcn, name); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	364
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	365 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	366 inline Array<U>
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	367 binmap (const T& x, const Array<R>& ya, U (*fcn) (T, R))
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	368 { return binmap<U, T, R, U (*) (T, R)> (x, ya, fcn); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	369
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	370 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	371 inline Array<U>
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	372 binmap (const Array<T>& xa, const R& y, U (*fcn) (T, R))
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	373 { return binmap<U, T, R, U (*) (T, R)> (xa, y, fcn); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	374
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	375 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	376 inline Sparse<U>
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	377 binmap (const Sparse<T>& xa, const Sparse<R>& ya, U (*fcn) (T, R),
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	378 const char *name)
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	379 { return binmap<U, T, R, U (*) (T, R)> (xa, ya, fcn, name); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	380
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	381 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	382 inline Sparse<U>
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	383 binmap (const T& x, const Sparse<R>& ya, U (*fcn) (T, R))
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	384 { return binmap<U, T, R, U (*) (T, R)> (x, ya, fcn); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	385
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	386 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	387 inline Sparse<U>
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	388 binmap (const Sparse<T>& xa, const R& y, U (*fcn) (T, R))
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	389 { return binmap<U, T, R, U (*) (T, R)> (xa, y, fcn); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	390
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	391 // Signature (const T&, const R&)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	392
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	393 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	394 inline Array<U>
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	395 binmap (const Array<T>& xa, const Array<R>& ya, U (*fcn) (const T&, const R&),
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	396 const char *name)
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	397 { return binmap<U, T, R, U (*) (const T&, const R&)> (xa, ya, fcn, name); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	398
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	399 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	400 inline Array<U>
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	401 binmap (const T& x, const Array<R>& ya, U (*fcn) (const T&, const R&))
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	402 { return binmap<U, T, R, U (*) (const T&, const R&)> (x, ya, fcn); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	403
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	404 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	405 inline Array<U>
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	406 binmap (const Array<T>& xa, const R& y, U (*fcn) (const T&, const R&))
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	407 { return binmap<U, T, R, U (*) (const T&, const R&)> (xa, y, fcn); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	408
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	409 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	410 inline Sparse<U>
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	411 binmap (const Sparse<T>& xa, const Sparse<R>& ya, U (*fcn) (const T&, const R&),
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	412 const char *name)
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	413 { return binmap<U, T, R, U (*) (const T&, const R&)> (xa, ya, fcn, name); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	414
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	415 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	416 inline Sparse<U>
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	417 binmap (const T& x, const Sparse<R>& ya, U (*fcn) (const T&, const R&))
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	418 { return binmap<U, T, R, U (*) (const T&, const R&)> (x, ya, fcn); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	419
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	420 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	421 inline Sparse<U>
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	422 binmap (const Sparse<T>& xa, const R& y, U (*fcn) (const T&, const R&))
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	423 { return binmap<U, T, R, U (*) (const T&, const R&)> (xa, y, fcn); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	424
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	425 // Signature (const T&, R)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	426
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	427 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	428 inline Array<U>
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	429 binmap (const Array<T>& xa, const Array<R>& ya, U (*fcn) (const T&, R),
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	430 const char *name)
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	431 { return binmap<U, T, R, U (*) (const T&, R)> (xa, ya, fcn, name); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	432
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	433 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	434 inline Array<U>
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	435 binmap (const T& x, const Array<R>& ya, U (*fcn) (const T&, R))
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	436 { return binmap<U, T, R, U (*) (const T&, R)> (x, ya, fcn); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	437
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	438 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	439 inline Array<U>
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	440 binmap (const Array<T>& xa, const R& y, U (*fcn) (const T&, R))
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	441 { return binmap<U, T, R, U (*) (const T&, R)> (xa, y, fcn); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	442
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	443 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	444 inline Sparse<U>
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	445 binmap (const Sparse<T>& xa, const Sparse<R>& ya, U (*fcn) (const T&, R),
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	446 const char *name)
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	447 { return binmap<U, T, R, U (*) (const T&, R)> (xa, ya, fcn, name); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	448
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	449 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	450 inline Sparse<U>
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	451 binmap (const T& x, const Sparse<R>& ya, U (*fcn) (const T&, R))
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	452 { return binmap<U, T, R, U (*) (const T&, R)> (x, ya, fcn); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	453
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	454 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	455 inline Sparse<U>
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	456 binmap (const Sparse<T>& xa, const R& y, U (*fcn) (const T&, R))
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	457 { return binmap<U, T, R, U (*) (const T&, R)> (xa, y, fcn); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	458
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	459 // Signature (T, const R&)
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	460
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	461 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	462 inline Array<U>
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	463 binmap (const Array<T>& xa, const Array<R>& ya, U (*fcn) (T, const R&),
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	464 const char *name)
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	465 { return binmap<U, T, R, U (*) (T, const R&)> (xa, ya, fcn, name); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	466
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	467 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	468 inline Array<U>
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	469 binmap (const T& x, const Array<R>& ya, U (*fcn) (T, const R&))
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	470 { return binmap<U, T, R, U (*) (T, const R&)> (x, ya, fcn); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	471
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	472 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	473 inline Array<U>
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	474 binmap (const Array<T>& xa, const R& y, U (*fcn) (T, const R&))
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	475 { return binmap<U, T, R, U (*) (T, const R&)> (xa, y, fcn); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	476
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	477 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	478 inline Sparse<U>
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	479 binmap (const Sparse<T>& xa, const Sparse<R>& ya, U (*fcn) (T, const R&),
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	480 const char *name)
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	481 { return binmap<U, T, R, U (*) (T, const R&)> (xa, ya, fcn, name); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	482
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	483 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	484 inline Sparse<U>
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	485 binmap (const T& x, const Sparse<R>& ya, U (*fcn) (T, const R&))
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	486 { return binmap<U, T, R, U (*) (T, const R&)> (x, ya, fcn); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	487
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	488 template <class U, class T, class R>
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	489 inline Sparse<U>
13006 61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	490 binmap (const Sparse<T>& xa, const R& y, U (*fcn) (T, const R&))
61be447052c3 Implement automatic bsxfun almost everywhere now except sparse matrices. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	491 { return binmap<U, T, R, U (*) (T, const R&)> (xa, y, fcn); }
10435 6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	492
6a271334750c implement general binary mapping facility Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	493 #endif

Mercurial > octave

annotate liboctave/util/oct-binmap.h @ 21100:e39e05d90788