Mercurial > octave

comparison liboctave/MArray.h @ 1230:92609e161b29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1995-04-10 01:08:57 by jwe]
author jwe
date Mon, 10 Apr 1995 01:14:34 +0000
parents 9689615b34f2
children f93b7fa5e113
comparison
equal deleted inserted replaced
1229:7d7c3eaa1d3b 1230:92609e161b29
51 MArray (int n) : Array<T> (n) { } 51 MArray (int n) : Array<T> (n) { }
52 MArray (int n, const T& val) : Array<T> (n, val) { } 52 MArray (int n, const T& val) : Array<T> (n, val) { }
53 MArray (const Array<T>& a) : Array<T> (a) { } 53 MArray (const Array<T>& a) : Array<T> (a) { }
54 MArray (const MArray<T>& a) : Array<T> (a) { } 54 MArray (const MArray<T>& a) : Array<T> (a) { }
55 55
56 ~MArray (void) { }
57
56 MArray<T>& operator = (const MArray<T>& a) 58 MArray<T>& operator = (const MArray<T>& a)
57 { 59 {
58 Array<T>::operator = (a); 60 Array<T>::operator = (a);
59 return *this; 61 return *this;
60 } 62 }
61 63
62 // Element by element MArray by scalar ops. 64 // Element by element MArray by scalar ops.
63 65
64 MArray<T>& operator += (const T& s); 66 friend MArray<T>& operator += (MArray<T>& a, const T& s);
65 MArray<T>& operator -= (const T& s); 67 friend MArray<T>& operator -= (MArray<T>& a, const T& s);
66 68
67 // Element by element MArray by MArray ops. 69 // Element by element MArray by MArray ops.
68 70
69 MArray<T>& operator += (const MArray<T>& a); 71 friend MArray<T>& operator += (MArray<T>& a, const MArray<T>& b);
70 MArray<T>& operator -= (const MArray<T>& a); 72 friend MArray<T>& operator -= (MArray<T>& a, const MArray<T>& b);
71 73
72 // Element by element MArray by scalar ops. 74 // Element by element MArray by scalar ops.
73 75
74 friend MArray<T> operator + (const MArray<T>& a, const T& s); 76 friend MArray<T> operator + (const MArray<T>& a, const T& s);
75 friend MArray<T> operator - (const MArray<T>& a, const T& s); 77 friend MArray<T> operator - (const MArray<T>& a, const T& s);
113 MArray2 (int n, int m, const T& val) : Array2<T> (n, m, val) { } 115 MArray2 (int n, int m, const T& val) : Array2<T> (n, m, val) { }
114 MArray2 (const Array2<T>& a) : Array2<T> (a) { } 116 MArray2 (const Array2<T>& a) : Array2<T> (a) { }
115 MArray2 (const MArray2<T>& a) : Array2<T> (a) { } 117 MArray2 (const MArray2<T>& a) : Array2<T> (a) { }
116 MArray2 (const MDiagArray<T>& a); 118 MArray2 (const MDiagArray<T>& a);
117 119
120 ~MArray2 (void) { }
121
118 MArray2<T>& operator = (const MArray2<T>& a) 122 MArray2<T>& operator = (const MArray2<T>& a)
119 { 123 {
120 Array2<T>::operator = (a); 124 Array2<T>::operator = (a);
121 return *this; 125 return *this;
122 } 126 }
123 127
124 // Element by element MArray2 by scalar ops. 128 // Element by element MArray2 by scalar ops.
125 129
126 MArray2<T>& operator += (const T& s); 130 friend MArray2<T>& operator += (MArray2<T>& a, const T& s);
127 MArray2<T>& operator -= (const T& s); 131 friend MArray2<T>& operator -= (MArray2<T>& a, const T& s);
128 132
129 // Element by element MArray2 by MArray2 ops. 133 // Element by element MArray2 by MArray2 ops.
130 134
131 MArray2<T>& operator += (const MArray2<T>& a); 135 friend MArray2<T>& operator += (MArray2<T>& a, const MArray2<T>& b);
132 MArray2<T>& operator -= (const MArray2<T>& a); 136 friend MArray2<T>& operator -= (MArray2<T>& a, const MArray2<T>& b);
133 137
134 // Element by element MArray2 by scalar ops. 138 // Element by element MArray2 by scalar ops.
135 139
136 friend MArray2<T> operator + (const MArray2<T>& a, const T& s); 140 friend MArray2<T> operator + (const MArray2<T>& a, const T& s);
137 friend MArray2<T> operator - (const MArray2<T>& a, const T& s); 141 friend MArray2<T> operator - (const MArray2<T>& a, const T& s);
176 MDiagArray (int r, int c, const T& val) : DiagArray<T> (r, c, val) { } 180 MDiagArray (int r, int c, const T& val) : DiagArray<T> (r, c, val) { }
177 MDiagArray (const DiagArray<T>& a) : DiagArray<T> (a) { } 181 MDiagArray (const DiagArray<T>& a) : DiagArray<T> (a) { }
178 MDiagArray (const MDiagArray<T>& a) : DiagArray<T> (a) { } 182 MDiagArray (const MDiagArray<T>& a) : DiagArray<T> (a) { }
179 MDiagArray (const MArray<T>& a) : DiagArray<T> (a) { } 183 MDiagArray (const MArray<T>& a) : DiagArray<T> (a) { }
180 184
185 ~MDiagArray (void) { }
186
181 MDiagArray<T>& operator = (const MDiagArray<T>& a) 187 MDiagArray<T>& operator = (const MDiagArray<T>& a)
182 { 188 {
183 DiagArray<T>::operator = (a); 189 DiagArray<T>::operator = (a);
184 return *this; 190 return *this;
185 } 191 }
186 192
187 // Element by element MDiagArray by MDiagArray ops. 193 // Element by element MDiagArray by MDiagArray ops.
188 194
189 MDiagArray<T>& operator += (const MDiagArray<T>& a); 195 friend MDiagArray<T>& operator += (MDiagArray<T>& a, const MDiagArray<T>& b);
190 MDiagArray<T>& operator -= (const MDiagArray<T>& a); 196 friend MDiagArray<T>& operator -= (MDiagArray<T>& a, const MDiagArray<T>& b);
191 197
192 // Element by element MDiagArray by scalar ops. 198 // Element by element MDiagArray by scalar ops.
193 199
194 friend MDiagArray<T> operator * (const MDiagArray<T>& a, const T& s); 200 friend MDiagArray<T> operator * (const MDiagArray<T>& a, const T& s);
195 friend MDiagArray<T> operator / (const MDiagArray<T>& a, const T& s); 201 friend MDiagArray<T> operator / (const MDiagArray<T>& a, const T& s);