octave-lyh: liboctave/MArray.cc annotate

annotate liboctave/MArray.cc @ 10396:a0b51ac0f88a

optimize accumdim with summation

author	Jaroslav Hajek <highegg@gmail.com>
date	Fri, 05 Mar 2010 12:31:30 +0100
parents	b47ab50a6aa8
children	fd0a3ac60b0e

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

Mercurial > hg > octave-lyh

annotate liboctave/MArray.cc @ 10396:a0b51ac0f88a