annotate liboctave/MArray.cc @ 1360:7eb93d12654c

[project @ 1995-09-05 21:51:54 by jwe]
author jwe
date Tue, 05 Sep 1995 21:51:54 +0000
parents 611d403c7f3d
children dd7d27461567
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
1 // MArray.cc -*- C++ -*-
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
2 /*
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
3
1011
18933dbd5e43 [project @ 1995-01-04 04:18:15 by jwe]
jwe
parents: 237
diff changeset
4 Copyright (C) 1992, 1993, 1994, 1995 John W. Eaton
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
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
10 Free Software Foundation; either version 2, or (at your option) any
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
11 later version.
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
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
19 along with Octave; see the file COPYING. If not, write to the Free
1315
611d403c7f3d [project @ 1995-06-25 19:56:32 by jwe]
jwe
parents: 1296
diff changeset
20 Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
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
1296
f93b7fa5e113 [project @ 1995-05-01 18:30:08 by jwe]
jwe
parents: 1230
diff changeset
24 #if defined (__GNUG__)
f93b7fa5e113 [project @ 1995-05-01 18:30:08 by jwe]
jwe
parents: 1230
diff changeset
25 #pragma implementation
f93b7fa5e113 [project @ 1995-05-01 18:30:08 by jwe]
jwe
parents: 1230
diff changeset
26 #endif
f93b7fa5e113 [project @ 1995-05-01 18:30:08 by jwe]
jwe
parents: 1230
diff changeset
27
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
28 #ifdef HAVE_CONFIG_H
1192
b6360f2d4fa6 [project @ 1995-03-30 21:38:35 by jwe]
jwe
parents: 1011
diff changeset
29 #include <config.h>
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
30 #endif
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
31
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
32 #include "MArray.h"
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
33 #include "lo-error.h"
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
34
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
35 // Nothing like a little CPP abuse to brighten everyone's day. Would
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
36 // have been nice to do this with template functions but as of 2.5.x,
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
37 // g++ seems to fail to resolve them properly.
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
38
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
39 #define DO_VS_OP(OP) \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
40 int l = a.length (); \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
41 T *result = 0; \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
42 if (l > 0) \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
43 { \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
44 result = new T [l]; \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
45 const T *x = a.data (); \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
46 for (int i = 0; i < l; i++) \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
47 result[i] = x[i] OP s; \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
48 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
49
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
50 #define DO_SV_OP(OP) \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
51 int l = a.length (); \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
52 T *result = 0; \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
53 if (l > 0) \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
54 { \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
55 result = new T [l]; \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
56 const T *x = a.data (); \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
57 for (int i = 0; i < l; i++) \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
58 result[i] = s OP x[i]; \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
59 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
60
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
61 #define DO_VV_OP(OP) \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
62 T *result = 0; \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
63 if (l > 0) \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
64 { \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
65 result = new T [l]; \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
66 const T *x = a.data (); \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
67 const T *y = b.data (); \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
68 for (int i = 0; i < l; i++) \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
69 result[i] = x[i] OP y[i]; \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
70 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
71
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
72 #define NEG_V \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
73 int l = a.length (); \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
74 T *result = 0; \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
75 if (l > 0) \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
76 { \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
77 result = new T [l]; \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
78 const T *x = a.data (); \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
79 for (int i = 0; i < l; i++) \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
80 result[i] = -x[i]; \
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
81 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
82
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
83 #define DO_VS_OP2(OP) \
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
84 int l = a.length (); \
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
85 if (l > 0) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
86 { \
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
87 T *tmp = a.fortran_vec (); \
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
88 for (int i = 0; i < l; i++) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
89 tmp[i] OP s; \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
90 }
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
91
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
92 #define DO_VV_OP2(OP) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
93 do \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
94 { \
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
95 T *a_tmp = a.fortran_vec (); \
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
96 const T *b_tmp = b.data (); \
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
97 for (int i = 0; i < l; i++) \
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
98 a_tmp[i] += b_tmp[i]; \
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
99 } \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
100 while (0)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
101
1360
7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe]
jwe
parents: 1315
diff changeset
102 // One dimensional array with math ops.
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
103
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
104 // Element by element MArray by scalar ops.
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
105
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
106 template <class T>
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
107 MArray<T>&
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
108 operator += (MArray<T>& a, const T& s)
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
109 {
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
110 DO_VS_OP2 (+=)
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
111 return a;
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
112 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
113
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
114 template <class T>
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
115 MArray<T>&
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
116 operator -= (MArray<T>& a, const T& s)
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
117 {
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
118 DO_VS_OP2 (-=)
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
119 return a;
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
120 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
121
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
122 // Element by element MArray by MArray ops.
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
123
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
124 template <class T>
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
125 MArray<T>&
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
126 operator += (MArray<T>& a, const MArray<T>& b)
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
127 {
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
128 int l = a.length ();
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
129 if (l > 0)
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
130 {
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
131 if (l != b.length ())
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
132 (*current_liboctave_error_handler) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
133 ("nonconformant += array operation attempted"); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
134 else
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
135 DO_VV_OP2 (+=);
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
136 }
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
137 return a;
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
138 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
139
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
140 template <class T>
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
141 MArray<T>&
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
142 operator -= (MArray<T>& a, const MArray<T>& b)
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
143 {
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
144 int l = a.length ();
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
145 if (l > 0)
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
146 {
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
147 if (l != b.length ())
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
148 (*current_liboctave_error_handler) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
149 ("nonconformant -= array operation attempted"); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
150 else
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
151 DO_VV_OP2 (-=);
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
152 }
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
153 return a;
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
154 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
155
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
156 // Element by element MArray by scalar ops.
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
157
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
158 #define MARRAY_AS_OP(OP) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
159 template <class T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
160 MArray<T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
161 operator OP (const MArray<T>& a, const T& s) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
162 { \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
163 DO_VS_OP (OP); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
164 return MArray<T> (result, l); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
165 }
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
166
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
167 MARRAY_AS_OP (+)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
168 MARRAY_AS_OP (-)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
169 MARRAY_AS_OP (*)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
170 MARRAY_AS_OP (/)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
171
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
172 // Element by element scalar by MArray ops.
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
173
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
174 #define MARRAY_SA_OP(OP) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
175 template <class T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
176 MArray<T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
177 operator OP (const T& s, const MArray<T>& a) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
178 { \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
179 DO_SV_OP (OP); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
180 return MArray<T> (result, l); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
181 }
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
182
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
183 MARRAY_SA_OP(+)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
184 MARRAY_SA_OP(-)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
185 MARRAY_SA_OP(*)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
186 MARRAY_SA_OP(/)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
187
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
188 // Element by element MArray by MArray ops.
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
189
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
190 #define MARRAY_AA_OP(FCN, OP, OP_STR) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
191 template <class T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
192 MArray<T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
193 FCN (const MArray<T>& a, const MArray<T>& b) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
194 { \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
195 int l = a.length (); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
196 if (l != b.length ()) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
197 { \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
198 (*current_liboctave_error_handler) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
199 ("nonconformant array " OP_STR " attempted"); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
200 return MArray<T> (); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
201 } \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
202 if (l == 0) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
203 return MArray<T> (); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
204 DO_VV_OP (OP); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
205 return MArray<T> (result, l); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
206 }
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
207
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
208 MARRAY_AA_OP (operator +, +, "addition")
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
209 MARRAY_AA_OP (operator -, -, "subtraction")
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
210 MARRAY_AA_OP (product, *, "multiplication")
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
211 MARRAY_AA_OP (quotient, /, "division")
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
212
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
213 // Unary MArray 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>
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
216 MArray<T>
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
217 operator - (const MArray<T>& a)
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
218 {
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
219 NEG_V;
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
220 return MArray<T> (result, l);
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
221 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
222
1360
7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe]
jwe
parents: 1315
diff changeset
223 // Two dimensional array with math ops.
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 template <class T>
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
226 MArray2<T>::MArray2 (const MDiagArray<T>& a)
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
227 : Array2<T> (a.rows (), a.cols (), T (0))
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
228 {
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
229 for (int i = 0; i < a.length (); i++)
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
230 elem (i, i) = a.elem (i, i);
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
231 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
232
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
233 // Element by element MArray2 by scalar ops.
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 template <class T>
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
236 MArray2<T>&
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
237 operator += (MArray2<T>& a, const T& s)
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
238 {
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
239 DO_VS_OP2 (+=)
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
240 return a;
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
241 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
242
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
243 template <class T>
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
244 MArray2<T>&
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
245 operator -= (MArray2<T>& a, const T& s)
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
246 {
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
247 DO_VS_OP2 (-=)
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
248 return a;
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
249 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
250
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
251 // Element by element MArray2 by MArray2 ops.
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
252
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
253 template <class T>
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
254 MArray2<T>&
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
255 operator += (MArray2<T>& a, const MArray2<T>& b)
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
256 {
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
257 int r = a.rows ();
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
258 int c = a.cols ();
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
259 if (r != b.rows () || c != b.cols ())
237
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 (*current_liboctave_error_handler)
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
262 ("nonconformant += array operation attempted");
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
263 }
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
264 else
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
265 {
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
266 if (r > 0 && c > 0)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
267 {
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
268 int l = a.length ();
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
269 DO_VV_OP2 (+=);
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
270 }
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
271 }
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
272 return a;
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
273 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
274
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
275 template <class T>
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
276 MArray2<T>&
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
277 operator -= (MArray2<T>& a, const MArray2<T>& b)
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
278 {
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
279 int r = a.rows ();
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
280 int c = a.cols ();
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
281 if (r != b.rows () || c != b.cols ())
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
282 {
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
283 (*current_liboctave_error_handler)
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
284 ("nonconformant -= array operation attempted");
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
285 }
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
286 else
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
287 {
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
288 if (r > 0 && c > 0)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
289 {
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
290 int l = a.length ();
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
291 DO_VV_OP2 (-=);
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
292 }
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
293 }
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
294 return a;
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
295 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
296
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
297 // Element by element MArray2 by scalar ops.
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
298
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
299 #define MARRAY_A2S_OP(OP) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
300 template <class T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
301 MArray2<T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
302 operator OP (const MArray2<T>& a, const T& s) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
303 { \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
304 DO_VS_OP (OP); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
305 return MArray2<T> (result, a.rows (), a.cols ()); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
306 }
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
307
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
308 MARRAY_A2S_OP (+)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
309 MARRAY_A2S_OP (-)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
310 MARRAY_A2S_OP (*)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
311 MARRAY_A2S_OP (/)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
312
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
313 // Element by element scalar by MArray2 ops.
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
314
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
315 #define MARRAY_SA2_OP(OP) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
316 template <class T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
317 MArray2<T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
318 operator OP (const T& s, const MArray2<T>& a) \
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 DO_SV_OP (OP); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
321 return MArray2<T> (result, a.rows (), a.cols ()); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
322 }
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
323
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
324 MARRAY_SA2_OP (+)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
325 MARRAY_SA2_OP (-)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
326 MARRAY_SA2_OP (*)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
327 MARRAY_SA2_OP (/)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
328
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
329 // Element by element MArray2 by MArray2 ops.
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
330
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
331 #define MARRAY_A2A2_OP(FCN, OP, OP_STR) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
332 template <class T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
333 MArray2<T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
334 FCN (const MArray2<T>& a, const MArray2<T>& b) \
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 int r = a.rows (); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
337 int c = a.cols (); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
338 if (r != b.rows () || c != b.cols ()) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
339 { \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
340 (*current_liboctave_error_handler) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
341 ("nonconformant array " OP_STR " attempted"); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
342 return MArray2<T> (); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
343 } \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
344 if (r == 0 || c == 0) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
345 return MArray2<T> (); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
346 int l = a.length (); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
347 DO_VV_OP (OP); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
348 return MArray2<T> (result, r, c); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
349 }
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
350
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
351 MARRAY_A2A2_OP (operator +, +, "addition")
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
352 MARRAY_A2A2_OP (operator -, -, "subtraction")
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
353 MARRAY_A2A2_OP (product, *, "product")
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
354 MARRAY_A2A2_OP (quotient, /, "quotient")
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
355
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
356 // Unary MArray2 ops.
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
357
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
358 template <class T>
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
359 MArray2<T>
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
360 operator - (const MArray2<T>& a)
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
361 {
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
362 NEG_V;
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
363 return MArray2<T> (result, a.rows (), a.cols ());
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
364 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
365
1360
7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe]
jwe
parents: 1315
diff changeset
366 // Two dimensional diagonal array with math ops.
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
367
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
368 // Element by element MDiagArray by MDiagArray ops.
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
369
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
370 template <class T>
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
371 MDiagArray<T>&
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
372 operator += (MDiagArray<T>& a, const MDiagArray<T>& b)
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
373 {
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
374 int r = a.rows ();
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
375 int c = a.cols ();
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
376 if (r != b.rows () || c != b.cols ())
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
377 {
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
378 (*current_liboctave_error_handler)
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
379 ("nonconformant array " OP_STR " attempted");
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
380 return MArray2<T> ();
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
381 }
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
382 else
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
383 {
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
384 int l = a.length ();
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
385 T *a_tmp = a.fortran_vec ();
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
386 const T *b_tmp = b.data ();
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
387 for (int i = 0; i < l; i++)
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
388 a_tmp[i] += b_tmp[i];
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
389 }
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
390 return a;
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
391 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
392
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
393 template <class T>
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
394 MDiagArray<T>&
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
395 operator -= (MDiagArray<T>& a, const MDiagArray<T>& b)
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
396 {
1230
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
397 int r = a.rows ();
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
398 int c = a.cols ();
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
399 if (r != b.rows () || c != b.cols ())
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
400 {
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
401 (*current_liboctave_error_handler)
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
402 ("nonconformant array " OP_STR " attempted");
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
403 return MArray2<T> ();
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
404 }
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
405 else
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
406 {
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
407 int l = a.length ();
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
408 T *a_tmp = a.fortran_vec ();
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
409 const T *b_tmp = b.data ();
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
410 for (int i = 0; i < l; i++)
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
411 a_tmp[i] -= b_tmp[i];
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
412 }
92609e161b29 [project @ 1995-04-10 01:08:57 by jwe]
jwe
parents: 1213
diff changeset
413 return a;
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
414 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
415
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
416 // Element by element MDiagArray by scalar ops.
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
417
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
418 #define MARRAY_DAS_OP(OP) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
419 template <class T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
420 MDiagArray<T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
421 operator OP (const MDiagArray<T>& a, const T& s) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
422 { \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
423 DO_VS_OP (OP); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
424 return MDiagArray<T> (result, a.rows (), a.cols ()); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
425 }
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
426
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
427 MARRAY_DAS_OP (*)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
428 MARRAY_DAS_OP (/)
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
429
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
430 // Element by element scalar by MDiagArray ops.
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
431
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
432 template <class T>
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
433 MDiagArray<T>
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
434 operator * (const T& s, const MDiagArray<T>& a)
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
435 {
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
436 DO_SV_OP (*);
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
437 return MDiagArray<T> (result, a.rows (), a.cols ());
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
438 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
439
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
440 // Element by element MDiagArray by MDiagArray ops.
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
441
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
442 #define MARRAY_DADA_OP(FCN, OP, OP_STR) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
443 template <class T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
444 MDiagArray<T> \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
445 FCN (const MDiagArray<T>& a, const MDiagArray<T>& b) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
446 { \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
447 int r = a.rows (); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
448 int c = a.cols (); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
449 if (r != b.rows () || c != b.cols ()) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
450 { \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
451 (*current_liboctave_error_handler) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
452 ("nonconformant diagonal array " OP_STR " attempted"); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
453 return MDiagArray<T> (); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
454 } \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
455 if (c == 0 || r == 0) \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
456 return MDiagArray<T> (); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
457 int l = a.length (); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
458 DO_VV_OP (OP); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
459 return MDiagArray<T> (result, r, c); \
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
460 }
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
461
1213
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
462 MARRAY_DADA_OP (operator +, +, "addition")
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
463 MARRAY_DADA_OP (operator -, -, "subtraction")
9689615b34f2 [project @ 1995-04-06 02:25:15 by jwe]
jwe
parents: 1192
diff changeset
464 MARRAY_DADA_OP (product, *, "product")
237
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
465
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
466 // Unary MDiagArray ops.
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
467
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
468 template <class T>
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
469 MDiagArray<T>
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
470 operator - (const MDiagArray<T>& a)
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
471 {
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
472 NEG_V;
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
473 return MDiagArray<T> (result, a.rows (), a.cols ());
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
474 }
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
475
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
476 /*
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
477 ;;; Local Variables: ***
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
478 ;;; mode: C++ ***
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
479 ;;; page-delimiter: "^/\\*" ***
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
480 ;;; End: ***
5a9e23307fb0 [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents:
diff changeset
481 */