octave-lyh: liboctave/array/MArray.cc annotate

annotate liboctave/array/MArray.cc @ 17371:9aca7020c89f

expint.m: Overhaul function. Better accuracy and faster performance. Improved documentation and added %!tests. * scripts/specfun/expint.m: Improved accuracy of calculations by adjusting quad() tolerance options. Speeded up performance by breaking out of series summation as soon as possible. Used persistent variables to avoid re-calculating expensive intermediate values. Added %!tests verified against arbitrary precision Mathematica calculations.

author	Rik <rik@octave.org>
date	Tue, 03 Sep 2013 16:01:06 -0700
parents	648dabbb4c6b
children

rev	line source
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	1 /*
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	2
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 13139 diff changeset	3 Copyright (C) 1993-2012 John W. Eaton
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	4 Copyright (C) 2009 VZLU Prague
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	5
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	7
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	9 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6508 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6508 diff changeset	11 option) any later version.
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	12
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	16 for more details.
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	17
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	18 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6508 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6508 diff changeset	20 <http://www.gnu.org/licenses/>.
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	21
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	22 */
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	23
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	24 #ifdef HAVE_CONFIG_H
1192 b6360f2d4fa6 [project @ 1995-03-30 21:38:35 by jwe] jwe parents: 1011 diff changeset	25 #include <config.h>
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	26 #endif
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	27
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	28 #include "MArray.h"
4669 334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: 4646 diff changeset	29 #include "Array-util.h"
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	30 #include "lo-error.h"
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	31
1989 a4b0826e240c [project @ 1996-03-02 00:33:22 by jwe] jwe parents: 1882 diff changeset	32 #include "MArray-defs.h"
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	33 #include "mx-inlines.cc"
1213 9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	34
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	35 template <class T>
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	36 struct _idxadds_helper
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	37 {
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	38 T *array;
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	39 T val;
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	40 _idxadds_helper (T *a, T v) : array (a), val (v) { }
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	41 void operator () (octave_idx_type i)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	42 { array[i] += val; }
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	43 };
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	44
6508 184ab67c3bc1 [project @ 2007-04-07 00:43:09 by jwe] jwe parents: 5307 diff changeset	45 template <class T>
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	46 struct _idxadda_helper
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	47 {
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	48 T *array;
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	49 const T *vals;
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	50 _idxadda_helper (T a, const T v) : array (a), vals (v) { }
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	51 void operator () (octave_idx_type i)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	52 { array[i] += *vals++; }
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	53 };
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	54
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	55 template <class T>
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	56 void
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	57 MArray<T>::idx_add (const idx_vector& idx, T val)
6508 184ab67c3bc1 [project @ 2007-04-07 00:43:09 by jwe] jwe parents: 5307 diff changeset	58 {
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	59 octave_idx_type n = this->length ();
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	60 octave_idx_type ext = idx.extent (n);
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	61 if (ext > n)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	62 {
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	63 this->resize1 (ext);
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	64 n = ext;
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	65 }
6508 184ab67c3bc1 [project @ 2007-04-07 00:43:09 by jwe] jwe parents: 5307 diff changeset	66
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	67 octave_quit ();
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	68
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	69 octave_idx_type len = idx.length (n);
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	70 idx.loop (len, _idxadds_helper<T> (this->fortran_vec (), val));
6508 184ab67c3bc1 [project @ 2007-04-07 00:43:09 by jwe] jwe parents: 5307 diff changeset	71 }
184ab67c3bc1 [project @ 2007-04-07 00:43:09 by jwe] jwe parents: 5307 diff changeset	72
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	73 template <class T>
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	74 void
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	75 MArray<T>::idx_add (const idx_vector& idx, const MArray<T>& vals)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	76 {
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	77 octave_idx_type n = this->length ();
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	78 octave_idx_type ext = idx.extent (n);
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	79 if (ext > n)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	80 {
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	81 this->resize1 (ext);
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	82 n = ext;
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	83 }
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	84
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	85 octave_quit ();
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	86
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	87 octave_idx_type len = std::min (idx.length (n), vals.length ());
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	88 idx.loop (len, _idxadda_helper<T> (this->fortran_vec (), vals.data ()));
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	89 }
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	90
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	91 template <class T, T op (typename ref_param<T>::type, typename ref_param<T>::type)>
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	92 struct _idxbinop_helper
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	93 {
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	94 T *array;
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	95 const T *vals;
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	96 _idxbinop_helper (T a, const T v) : array (a), vals (v) { }
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	97 void operator () (octave_idx_type i)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	98 { array[i] = op (array[i], *vals++); }
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	99 };
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	100
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	101 template <class T>
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	102 void
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	103 MArray<T>::idx_min (const idx_vector& idx, const MArray<T>& vals)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	104 {
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	105 octave_idx_type n = this->length ();
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	106 octave_idx_type ext = idx.extent (n);
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	107 if (ext > n)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	108 {
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	109 this->resize1 (ext);
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	110 n = ext;
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	111 }
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	112
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	113 octave_quit ();
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	114
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	115 octave_idx_type len = std::min (idx.length (n), vals.length ());
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	116 idx.loop (len, _idxbinop_helper<T, xmin> (this->fortran_vec (), vals.data ()));
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	117 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	118
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	119 template <class T>
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	120 void
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	121 MArray<T>::idx_max (const idx_vector& idx, const MArray<T>& vals)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	122 {
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	123 octave_idx_type n = this->length ();
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	124 octave_idx_type ext = idx.extent (n);
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	125 if (ext > n)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	126 {
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	127 this->resize1 (ext);
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	128 n = ext;
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	129 }
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	130
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	131 octave_quit ();
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	132
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	133 octave_idx_type len = std::min (idx.length (n), vals.length ());
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	134 idx.loop (len, _idxbinop_helper<T, xmax> (this->fortran_vec (), vals.data ()));
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	135 }
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	136
10396 a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	137 #include <iostream>
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	138
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	139 template <class T>
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	140 void MArray<T>::idx_add_nd (const idx_vector& idx, const MArray<T>& vals, int dim)
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	141 {
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	142 int nd = std::max (this->ndims (), vals.ndims ());
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	143 if (dim < 0)
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	144 dim = vals.dims ().first_non_singleton ();
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	145 else if (dim > nd)
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	146 nd = dim;
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	147
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	148 // Check dimensions.
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	149 dim_vector ddv = Array<T>::dims ().redim (nd);
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	150 dim_vector sdv = vals.dims ().redim (nd);
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	151
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	152 octave_idx_type ext = idx.extent (ddv (dim));
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	153
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	154 if (ext > ddv(dim))
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	155 {
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	156 ddv(dim) = ext;
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	157 Array<T>::resize (ddv);
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	158 ext = ddv(dim);
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	159 }
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	160
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	161 octave_idx_type l,n,u,ns;
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	162 get_extent_triplet (ddv, dim, l, n, u);
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	163 ns = sdv(dim);
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	164
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	165 sdv(dim) = ddv(dim) = 0;
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	166 if (ddv != sdv)
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	167 (*current_liboctave_error_handler)
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	168 ("accumdim: dimension mismatch");
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	169
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	170 T *dst = Array<T>::fortran_vec ();
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	171 const T *src = vals.data ();
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	172 octave_idx_type len = idx.length (ns);
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	173
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	174 if (l == 1)
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	175 {
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	176 for (octave_idx_type j = 0; j < u; j++)
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	177 {
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	178 octave_quit ();
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	179
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	180 idx.loop (len, _idxadda_helper<T> (dst + jn, src + jns));
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	181 }
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	182 }
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	183 else
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	184 {
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	185 for (octave_idx_type j = 0; j < u; j++)
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	186 {
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	187 octave_quit ();
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	188 for (octave_idx_type i = 0; i < len; i++)
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	189 {
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	190 octave_idx_type k = idx(i);
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	191
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	192 mx_inline_add2 (l, dst + lk, src + li);
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	193 }
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	194
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	195 dst += l*n;
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	196 src += l*ns;
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	197 }
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	198 }
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	199 }
a0b51ac0f88a optimize accumdim with summation Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	200
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	201 // N-dimensional array with math ops.
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	202 template <class T>
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	203 void
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	204 MArray<T>::changesign (void)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	205 {
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	206 if (Array<T>::is_shared ())
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	207 this = - this;
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	208 else
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	209 do_mx_inplace_op<T> (*this, mx_inline_uminus2);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	210 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	211
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	212 // Element by element MArray by scalar ops.
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	213
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	214 template <class T>
1213 9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	215 MArray<T>&
1230 92609e161b29 [project @ 1995-04-10 01:08:57 by jwe] jwe parents: 1213 diff changeset	216 operator += (MArray<T>& a, const T& s)
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	217 {
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	218 if (a.is_shared ())
9612 66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 9557 diff changeset	219 a = a + s;
66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 9557 diff changeset	220 else
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	221 do_ms_inplace_op<T, T> (a, s, mx_inline_add2);
1230 92609e161b29 [project @ 1995-04-10 01:08:57 by jwe] jwe parents: 1213 diff changeset	222 return a;
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	223 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	224
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	225 template <class T>
1213 9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	226 MArray<T>&
1230 92609e161b29 [project @ 1995-04-10 01:08:57 by jwe] jwe parents: 1213 diff changeset	227 operator -= (MArray<T>& a, const T& s)
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	228 {
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	229 if (a.is_shared ())
9612 66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 9557 diff changeset	230 a = a - s;
66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 9557 diff changeset	231 else
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	232 do_ms_inplace_op<T, T> (a, s, mx_inline_sub2);
1230 92609e161b29 [project @ 1995-04-10 01:08:57 by jwe] jwe parents: 1213 diff changeset	233 return a;
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	234 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	235
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	236 template <class T>
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	237 MArray<T>&
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	238 operator *= (MArray<T>& a, const T& s)
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	239 {
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	240 if (a.is_shared ())
9612 66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 9557 diff changeset	241 a = a * s;
66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 9557 diff changeset	242 else
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	243 do_ms_inplace_op<T, T> (a, s, mx_inline_mul2);
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	244 return a;
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	245 }
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	246
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	247 template <class T>
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	248 MArray<T>&
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	249 operator /= (MArray<T>& a, const T& s)
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	250 {
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	251 if (a.is_shared ())
9612 66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 9557 diff changeset	252 a = a / s;
66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 9557 diff changeset	253 else
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	254 do_ms_inplace_op<T, T> (a, s, mx_inline_div2);
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	255 return a;
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	256 }
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	257
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	258 // Element by element MArray by MArray ops.
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	259
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	260 template <class T>
1213 9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	261 MArray<T>&
1230 92609e161b29 [project @ 1995-04-10 01:08:57 by jwe] jwe parents: 1213 diff changeset	262 operator += (MArray<T>& a, const MArray<T>& b)
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	263 {
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	264 if (a.is_shared ())
9612 66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 9557 diff changeset	265 a = a + b;
66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 9557 diff changeset	266 else
13139 aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13004 diff changeset	267 do_mm_inplace_op<T, T> (a, b, mx_inline_add2, mx_inline_add2, "+=");
1230 92609e161b29 [project @ 1995-04-10 01:08:57 by jwe] jwe parents: 1213 diff changeset	268 return a;
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	269 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	270
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	271 template <class T>
1213 9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	272 MArray<T>&
1230 92609e161b29 [project @ 1995-04-10 01:08:57 by jwe] jwe parents: 1213 diff changeset	273 operator -= (MArray<T>& a, const MArray<T>& b)
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	274 {
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 8934 diff changeset	275 if (a.is_shared ())
9612 66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 9557 diff changeset	276 a = a - b;
66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 9557 diff changeset	277 else
13139 aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13004 diff changeset	278 do_mm_inplace_op<T, T> (a, b, mx_inline_sub2, mx_inline_sub2, "-=");
1230 92609e161b29 [project @ 1995-04-10 01:08:57 by jwe] jwe parents: 1213 diff changeset	279 return a;
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	280 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	281
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	282
9557 3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	283 template <class T>
3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	284 MArray<T>&
3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	285 product_eq (MArray<T>& a, const MArray<T>& b)
3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	286 {
3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	287 if (a.is_shared ())
3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	288 return a = product (a, b);
9612 66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 9557 diff changeset	289 else
13139 aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13004 diff changeset	290 do_mm_inplace_op<T, T> (a, b, mx_inline_mul2, mx_inline_mul2, ".*=");
9557 3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	291 return a;
3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	292 }
3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	293
3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	294 template <class T>
3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	295 MArray<T>&
3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	296 quotient_eq (MArray<T>& a, const MArray<T>& b)
3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	297 {
3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	298 if (a.is_shared ())
3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	299 return a = quotient (a, b);
9612 66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 9557 diff changeset	300 else
13139 aa4a23337a0f Enable BSX in-place for missing assignment operators Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13004 diff changeset	301 do_mm_inplace_op<T, T> (a, b, mx_inline_div2, mx_inline_div2, "./=");
9557 3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	302 return a;
3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	303 }
3a1dd361f978 optimize .=, ./= operators Jaroslav Hajek <highegg@gmail.com>* parents: 9546 diff changeset	304
1213 9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	305 // Element by element MArray by scalar ops.
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	306
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	307 #define MARRAY_NDS_OP(OP, FN) \
1213 9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	308 template <class T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	309 MArray<T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	310 operator OP (const MArray<T>& a, const T& s) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	311 { \
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	312 return do_ms_binary_op<T, T, T> (a, s, FN); \
1213 9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	313 }
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	314
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	315 MARRAY_NDS_OP (+, mx_inline_add)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	316 MARRAY_NDS_OP (-, mx_inline_sub)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	317 MARRAY_NDS_OP (*, mx_inline_mul)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	318 MARRAY_NDS_OP (/, mx_inline_div)
1213 9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	319
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	320 // Element by element scalar by MArray ops.
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	321
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	322 #define MARRAY_SND_OP(OP, FN) \
1213 9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	323 template <class T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	324 MArray<T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	325 operator OP (const T& s, const MArray<T>& a) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	326 { \
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	327 return do_sm_binary_op<T, T, T> (s, a, FN); \
3504 5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 2847 diff changeset	328 }
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	329
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	330 MARRAY_SND_OP (+, mx_inline_add)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	331 MARRAY_SND_OP (-, mx_inline_sub)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	332 MARRAY_SND_OP (*, mx_inline_mul)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	333 MARRAY_SND_OP (/, mx_inline_div)
1213 9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	334
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	335 // Element by element MArray by MArray ops.
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	336
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	337 #define MARRAY_NDND_OP(FCN, OP, FN) \
1213 9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	338 template <class T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	339 MArray<T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	340 FCN (const MArray<T>& a, const MArray<T>& b) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	341 { \
13004 d9d65c3017c3 Make bsxfun automatic for most binary operators. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	342 return do_mm_binary_op<T, T, T> (a, b, FN, FN, FN, #FCN); \
1213 9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe] jwe parents: 1192 diff changeset	343 }
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	344
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	345 MARRAY_NDND_OP (operator +, +, mx_inline_add)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	346 MARRAY_NDND_OP (operator -, -, mx_inline_sub)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	347 MARRAY_NDND_OP (product, *, mx_inline_mul)
12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	348 MARRAY_NDND_OP (quotient, /, mx_inline_div)
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	349
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	350 template <class T>
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	351 MArray<T>
3574 787bb9d8f60e [project @ 2000-02-04 10:13:23 by jwe] jwe parents: 3573 diff changeset	352 operator + (const MArray<T>& a)
787bb9d8f60e [project @ 2000-02-04 10:13:23 by jwe] jwe parents: 3573 diff changeset	353 {
787bb9d8f60e [project @ 2000-02-04 10:13:23 by jwe] jwe parents: 3573 diff changeset	354 return a;
787bb9d8f60e [project @ 2000-02-04 10:13:23 by jwe] jwe parents: 3573 diff changeset	355 }
787bb9d8f60e [project @ 2000-02-04 10:13:23 by jwe] jwe parents: 3573 diff changeset	356
787bb9d8f60e [project @ 2000-02-04 10:13:23 by jwe] jwe parents: 3573 diff changeset	357 template <class T>
787bb9d8f60e [project @ 2000-02-04 10:13:23 by jwe] jwe parents: 3573 diff changeset	358 MArray<T>
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	359 operator - (const MArray<T>& a)
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	360 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	361 return do_mx_unary_op<T, T> (a, mx_inline_uminus);
237 5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe] jwe parents: diff changeset	362 }

Mercurial > hg > octave-lyh

annotate liboctave/array/MArray.cc @ 17371:9aca7020c89f