Mercurial > hg > octave-nkf

annotate liboctave/MArray2.cc @ 9585:06b8b51dca48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
also handle user-defined graphics properties in new property name validation scheme
author John W. Eaton <jwe@octave.org>
date Fri, 28 Aug 2009 18:37:31 -0400
parents 3a1dd361f978
children 66970dd627f6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
1 /*
7b56630a1e05 [project @ 1996-03-02 00:33:22 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) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2007
a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe]
jwe
parents: 7016
diff changeset
4 John W. Eaton
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
5
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
6 This file is part of Octave.
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
7
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
8 Octave is free software; you can redistribute it and/or modify it
7b56630a1e05 [project @ 1996-03-02 00:33:22 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: 5307
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: 5307
diff changeset
11 option) any later version.
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
12
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
13 Octave is distributed in the hope that it will be useful, but WITHOUT
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
16 for more details.
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
17
7b56630a1e05 [project @ 1996-03-02 00:33:22 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: 5307
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: 5307
diff changeset
20 <http://www.gnu.org/licenses/>.
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
21
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
22 */
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
23
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
24 #ifdef HAVE_CONFIG_H
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
25 #include <config.h>
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
26 #endif
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
27
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
28 #include "MArray2.h"
4669
334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe]
jwe
parents: 4646
diff changeset
29 #include "Array-util.h"
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
30 #include "lo-error.h"
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
31
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
32 #include "MArray-defs.h"
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
33
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
34 // Two dimensional array with math ops.
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
35
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
36 // Element by element MArray2 by scalar ops.
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
37
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
38 template <class T>
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
39 MArray2<T>&
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
40 operator += (MArray2<T>& a, const T& s)
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
41 {
9546
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
42 if (a.is_shared ())
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
43 return a = a + s;
4646
eff8f977508c [project @ 2003-11-23 18:13:19 by jwe]
jwe
parents: 4192
diff changeset
44 DO_VS_OP2 (T, a, +=, s)
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
45 return a;
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
46 }
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
47
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
48 template <class T>
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
49 MArray2<T>&
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
50 operator -= (MArray2<T>& a, const T& s)
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
51 {
9546
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
52 if (a.is_shared ())
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
53 return a = a - s;
4646
eff8f977508c [project @ 2003-11-23 18:13:19 by jwe]
jwe
parents: 4192
diff changeset
54 DO_VS_OP2 (T, a, -=, s)
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
55 return a;
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
56 }
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
57
9546
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
58 template <class T>
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
59 MArray2<T>&
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
60 operator *= (MArray2<T>& a, const T& s)
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
61 {
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
62 if (a.is_shared ())
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
63 return a = a * s;
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
64 DO_VS_OP2 (T, a, *=, s)
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
65 return a;
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
66 }
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
67
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
68 template <class T>
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
69 MArray2<T>&
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
70 operator /= (MArray2<T>& a, const T& s)
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
71 {
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
72 if (a.is_shared ())
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
73 return a = a / s;
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
74 DO_VS_OP2 (T, a, /=, s)
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
75 return a;
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
76 }
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
77
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
78 // Element by element MArray2 by MArray2 ops.
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
79
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
80 template <class T>
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
81 MArray2<T>&
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
82 operator += (MArray2<T>& a, const MArray2<T>& b)
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
83 {
9546
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
84 if (a.is_shared ())
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
85 return a = a + b;
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
86 octave_idx_type r = a.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
87 octave_idx_type c = a.cols ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
88 octave_idx_type br = b.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
89 octave_idx_type bc = b.cols ();
2383
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1994
diff changeset
90 if (r != br || c != bc)
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1994
diff changeset
91 gripe_nonconformant ("operator +=", r, c, br, bc);
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
92 else
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
93 {
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
94 if (r > 0 && c > 0)
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
95 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
96 octave_idx_type l = a.length ();
4646
eff8f977508c [project @ 2003-11-23 18:13:19 by jwe]
jwe
parents: 4192
diff changeset
97 DO_VV_OP2 (T, a, +=, b);
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
98 }
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
99 }
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
100 return a;
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
101 }
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
102
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
103 template <class T>
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
104 MArray2<T>&
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
105 operator -= (MArray2<T>& a, const MArray2<T>& b)
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
106 {
9546
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
107 if (a.is_shared ())
1beb23d2b892 optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
108 return a = a - b;
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
109 octave_idx_type r = a.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
110 octave_idx_type c = a.cols ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
111 octave_idx_type br = b.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
112 octave_idx_type bc = b.cols ();
2383
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1994
diff changeset
113 if (r != br || c != bc)
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1994
diff changeset
114 gripe_nonconformant ("operator -=", r, c, br, bc);
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
115 else
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
116 {
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
117 if (r > 0 && c > 0)
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
118 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
119 octave_idx_type l = a.length ();
4646
eff8f977508c [project @ 2003-11-23 18:13:19 by jwe]
jwe
parents: 4192
diff changeset
120 DO_VV_OP2 (T, a, -=, b);
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
121 }
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
122 }
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
123 return a;
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
124 }
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
125
9557
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
126
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
127 template <class T>
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
128 MArray2<T>&
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
129 product_eq (MArray2<T>& a, const MArray2<T>& b)
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
130 {
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
131 if (a.is_shared ())
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
132 return a = product (a, b);
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
133 octave_idx_type r = a.rows ();
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
134 octave_idx_type c = a.cols ();
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
135 octave_idx_type br = b.rows ();
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
136 octave_idx_type bc = b.cols ();
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
137 if (r != br || c != bc)
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
138 gripe_nonconformant ("operator .*=", r, c, br, bc);
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
139 else
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
140 {
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
141 if (r > 0 && c > 0)
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
142 {
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
143 octave_idx_type l = a.length ();
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
144 DO_VV_OP2 (T, a, *=, b);
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
145 }
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
146 }
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
147 return a;
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
148 }
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
149
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
150 template <class T>
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
151 MArray2<T>&
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
152 quotient_eq (MArray2<T>& a, const MArray2<T>& b)
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
153 {
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
154 if (a.is_shared ())
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
155 return a = quotient (a, b);
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
156 octave_idx_type r = a.rows ();
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
157 octave_idx_type c = a.cols ();
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
158 octave_idx_type br = b.rows ();
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
159 octave_idx_type bc = b.cols ();
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
160 if (r != br || c != bc)
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
161 gripe_nonconformant ("operator ./=", r, c, br, bc);
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
162 else
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
163 {
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
164 if (r > 0 && c > 0)
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
165 {
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
166 octave_idx_type l = a.length ();
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
167 DO_VV_OP2 (T, a, /=, b);
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
168 }
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
169 }
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
170 return a;
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
171 }
3a1dd361f978 optimize .*=, ./= operators
Jaroslav Hajek <highegg@gmail.com>
parents: 9546
diff changeset
172
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
173 // Element by element MArray2 by scalar ops.
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
174
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
175 #define MARRAY_A2S_OP(OP) \
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
176 template <class T> \
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
177 MArray2<T> \
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
178 operator OP (const MArray2<T>& a, const T& s) \
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
179 { \
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
180 MArray2<T> result (a.rows (), a.cols ()); \
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
181 T *r = result.fortran_vec (); \
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
182 octave_idx_type l = a.length (); \
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
183 const T *v = a.data (); \
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
184 DO_VS_OP (r, l, v, OP, s); \
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
185 return result; \
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
186 }
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
187
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
188 MARRAY_A2S_OP (+)
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
189 MARRAY_A2S_OP (-)
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
190 MARRAY_A2S_OP (*)
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
191 MARRAY_A2S_OP (/)
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
192
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
193 // Element by element scalar by MArray2 ops.
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
194
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
195 #define MARRAY_SA2_OP(OP) \
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
196 template <class T> \
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
197 MArray2<T> \
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
198 operator OP (const T& s, const MArray2<T>& a) \
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
199 { \
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
200 MArray2<T> result (a.rows (), a.cols ()); \
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
201 T *r = result.fortran_vec (); \
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
202 octave_idx_type l = a.length (); \
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
203 const T *v = a.data (); \
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
204 DO_SV_OP (r, l, s, OP, v); \
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
205 return result; \
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
206 }
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
207
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
208 MARRAY_SA2_OP (+)
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
209 MARRAY_SA2_OP (-)
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
210 MARRAY_SA2_OP (*)
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
211 MARRAY_SA2_OP (/)
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
212
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
213 // Element by element MArray2 by MArray2 ops.
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
214
2383
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1994
diff changeset
215 #define MARRAY_A2A2_OP(FCN, OP) \
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
216 template <class T> \
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
217 MArray2<T> \
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
218 FCN (const MArray2<T>& a, const MArray2<T>& b) \
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
219 { \
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
220 octave_idx_type a_nr = a.rows (); \
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
221 octave_idx_type a_nc = a.cols (); \
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
222 octave_idx_type b_nr = b.rows (); \
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
223 octave_idx_type b_nc = b.cols (); \
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
224 if (a_nr != b_nr || a_nc != b_nc) \
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
225 { \
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
226 gripe_nonconformant (#FCN, a_nr, a_nc, b_nr, b_nc); \
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
227 return MArray2<T> (); \
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
228 } \
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
229 if (a_nr == 0 || a_nc == 0) \
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
230 return MArray2<T> (a_nr, a_nc); \
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
231 octave_idx_type l = a.length (); \
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
232 MArray2<T> result (a_nr, a_nc); \
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
233 T *r = result.fortran_vec (); \
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
234 const T *x = a.data (); \
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
235 const T *y = b.data (); \
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
236 DO_VV_OP (r, l, x, OP, y); \
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
237 return result; \
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
238 }
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
239
2383
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1994
diff changeset
240 MARRAY_A2A2_OP (operator +, +)
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1994
diff changeset
241 MARRAY_A2A2_OP (operator -, -)
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1994
diff changeset
242 MARRAY_A2A2_OP (product, *)
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1994
diff changeset
243 MARRAY_A2A2_OP (quotient, /)
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
244
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
245 // Unary MArray2 ops.
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
246
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
247 template <class T>
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
248 MArray2<T>
3574
787bb9d8f60e [project @ 2000-02-04 10:13:23 by jwe]
jwe
parents: 3504
diff changeset
249 operator + (const MArray2<T>& a)
787bb9d8f60e [project @ 2000-02-04 10:13:23 by jwe]
jwe
parents: 3504
diff changeset
250 {
787bb9d8f60e [project @ 2000-02-04 10:13:23 by jwe]
jwe
parents: 3504
diff changeset
251 return a;
787bb9d8f60e [project @ 2000-02-04 10:13:23 by jwe]
jwe
parents: 3504
diff changeset
252 }
787bb9d8f60e [project @ 2000-02-04 10:13:23 by jwe]
jwe
parents: 3504
diff changeset
253
787bb9d8f60e [project @ 2000-02-04 10:13:23 by jwe]
jwe
parents: 3504
diff changeset
254 template <class T>
787bb9d8f60e [project @ 2000-02-04 10:13:23 by jwe]
jwe
parents: 3504
diff changeset
255 MArray2<T>
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
256 operator - (const MArray2<T>& a)
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
257 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
258 octave_idx_type l = a.length ();
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
259 MArray2<T> result (a.rows (), a.cols ());
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
260 T *r = result.fortran_vec ();
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
261 const T *x = a.data ();
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
262 NEG_V (r, l, x);
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3178
diff changeset
263 return result;
1988
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
264 }
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
265
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
266 /*
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
267 ;;; Local Variables: ***
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
268 ;;; mode: C++ ***
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
269 ;;; End: ***
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe]
jwe
parents:
diff changeset
270 */