Mercurial > octave
annotate liboctave/array/CDiagMatrix.cc @ 25054:6652d3823428 stable
maint: Update copyright dates in all source files.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 30 Mar 2018 09:19:05 -0400 |
parents | 194eb4bd202b |
children | cb1606f78f6b |
rev | line source |
---|---|
458 | 1 /* |
2 | |
25054
6652d3823428
maint: Update copyright dates in all source files.
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
3 Copyright (C) 1994-2018 John W. Eaton |
9601
a9b37bae1802
add a couple of missing copyright statements
Jaroslav Hajek <highegg@gmail.com>
parents:
9550
diff
changeset
|
4 Copyright (C) 2009 VZLU Prague |
458 | 5 |
6 This file is part of Octave. | |
7 | |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
23807
diff
changeset
|
8 Octave is free software: you can redistribute it and/or modify it |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
9 under the terms of the GNU General Public License as published by |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
23807
diff
changeset
|
10 the Free Software Foundation, either version 3 of the License, or |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
11 (at your option) any later version. |
458 | 12 |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
13 Octave is distributed in the hope that it will be useful, but |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
14 WITHOUT ANY WARRANTY; without even the implied warranty of |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
16 GNU General Public License for more details. |
458 | 17 |
18 You should have received a copy of the GNU General Public License | |
7016 | 19 along with Octave; see the file COPYING. If not, see |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
23807
diff
changeset
|
20 <https://www.gnu.org/licenses/>. |
458 | 21 |
22 */ | |
23 | |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
24 #if defined (HAVE_CONFIG_H) |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21202
diff
changeset
|
25 # include "config.h" |
458 | 26 #endif |
27 | |
3503 | 28 #include <iostream> |
458 | 29 |
4669 | 30 #include "Array-util.h" |
1368 | 31 #include "lo-error.h" |
9003
0631d397fbe0
replace lo_ieee_isnan by xisnan, add missing includes
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
32 #include "lo-ieee.h" |
458 | 33 #include "mx-base.h" |
34 #include "mx-inlines.cc" | |
1650 | 35 #include "oct-cmplx.h" |
458 | 36 |
1360 | 37 // Complex Diagonal Matrix class |
458 | 38 |
39 ComplexDiagMatrix::ComplexDiagMatrix (const DiagMatrix& a) | |
1989 | 40 : MDiagArray2<Complex> (a.rows (), a.cols ()) |
458 | 41 { |
5275 | 42 for (octave_idx_type i = 0; i < length (); i++) |
458 | 43 elem (i, i) = a.elem (i, i); |
44 } | |
45 | |
2386 | 46 bool |
458 | 47 ComplexDiagMatrix::operator == (const ComplexDiagMatrix& a) const |
48 { | |
49 if (rows () != a.rows () || cols () != a.cols ()) | |
50 return 0; | |
51 | |
9550
3d6a9aea2aea
refactor binary & bool ops in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
9003
diff
changeset
|
52 return mx_inline_equal (length (), data (), a.data ()); |
458 | 53 } |
54 | |
2386 | 55 bool |
458 | 56 ComplexDiagMatrix::operator != (const ComplexDiagMatrix& a) const |
57 { | |
58 return !(*this == a); | |
59 } | |
60 | |
61 ComplexDiagMatrix& | |
62 ComplexDiagMatrix::fill (double val) | |
63 { | |
5275 | 64 for (octave_idx_type i = 0; i < length (); i++) |
458 | 65 elem (i, i) = val; |
66 return *this; | |
67 } | |
68 | |
69 ComplexDiagMatrix& | |
70 ComplexDiagMatrix::fill (const Complex& val) | |
71 { | |
5275 | 72 for (octave_idx_type i = 0; i < length (); i++) |
458 | 73 elem (i, i) = val; |
74 return *this; | |
75 } | |
76 | |
77 ComplexDiagMatrix& | |
5275 | 78 ComplexDiagMatrix::fill (double val, octave_idx_type beg, octave_idx_type end) |
458 | 79 { |
80 if (beg < 0 || end >= length () || end < beg) | |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
81 (*current_liboctave_error_handler) ("range error for fill"); |
458 | 82 |
5275 | 83 for (octave_idx_type i = beg; i <= end; i++) |
458 | 84 elem (i, i) = val; |
85 | |
86 return *this; | |
87 } | |
88 | |
89 ComplexDiagMatrix& | |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
90 ComplexDiagMatrix::fill (const Complex& val, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
91 octave_idx_type beg, octave_idx_type end) |
458 | 92 { |
93 if (beg < 0 || end >= length () || end < beg) | |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
94 (*current_liboctave_error_handler) ("range error for fill"); |
458 | 95 |
5275 | 96 for (octave_idx_type i = beg; i <= end; i++) |
458 | 97 elem (i, i) = val; |
98 | |
99 return *this; | |
100 } | |
101 | |
102 ComplexDiagMatrix& | |
103 ComplexDiagMatrix::fill (const ColumnVector& a) | |
104 { | |
5275 | 105 octave_idx_type len = length (); |
20232
a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
Carnë Draug <carandraug@octave.org>
parents:
19697
diff
changeset
|
106 if (a.numel () != len) |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
107 (*current_liboctave_error_handler) ("range error for fill"); |
458 | 108 |
5275 | 109 for (octave_idx_type i = 0; i < len; i++) |
458 | 110 elem (i, i) = a.elem (i); |
111 | |
112 return *this; | |
113 } | |
114 | |
115 ComplexDiagMatrix& | |
116 ComplexDiagMatrix::fill (const ComplexColumnVector& a) | |
117 { | |
5275 | 118 octave_idx_type len = length (); |
20232
a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
Carnë Draug <carandraug@octave.org>
parents:
19697
diff
changeset
|
119 if (a.numel () != len) |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
120 (*current_liboctave_error_handler) ("range error for fill"); |
458 | 121 |
5275 | 122 for (octave_idx_type i = 0; i < len; i++) |
458 | 123 elem (i, i) = a.elem (i); |
124 | |
125 return *this; | |
126 } | |
127 | |
128 ComplexDiagMatrix& | |
129 ComplexDiagMatrix::fill (const RowVector& a) | |
130 { | |
5275 | 131 octave_idx_type len = length (); |
20232
a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
Carnë Draug <carandraug@octave.org>
parents:
19697
diff
changeset
|
132 if (a.numel () != len) |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
133 (*current_liboctave_error_handler) ("range error for fill"); |
458 | 134 |
5275 | 135 for (octave_idx_type i = 0; i < len; i++) |
458 | 136 elem (i, i) = a.elem (i); |
137 | |
138 return *this; | |
139 } | |
140 | |
141 ComplexDiagMatrix& | |
142 ComplexDiagMatrix::fill (const ComplexRowVector& a) | |
143 { | |
5275 | 144 octave_idx_type len = length (); |
20232
a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
Carnë Draug <carandraug@octave.org>
parents:
19697
diff
changeset
|
145 if (a.numel () != len) |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
146 (*current_liboctave_error_handler) ("range error for fill"); |
458 | 147 |
5275 | 148 for (octave_idx_type i = 0; i < len; i++) |
458 | 149 elem (i, i) = a.elem (i); |
150 | |
151 return *this; | |
152 } | |
153 | |
154 ComplexDiagMatrix& | |
5275 | 155 ComplexDiagMatrix::fill (const ColumnVector& a, octave_idx_type beg) |
458 | 156 { |
20232
a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
Carnë Draug <carandraug@octave.org>
parents:
19697
diff
changeset
|
157 octave_idx_type a_len = a.numel (); |
458 | 158 if (beg < 0 || beg + a_len >= length ()) |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
159 (*current_liboctave_error_handler) ("range error for fill"); |
458 | 160 |
5275 | 161 for (octave_idx_type i = 0; i < a_len; i++) |
458 | 162 elem (i+beg, i+beg) = a.elem (i); |
163 | |
164 return *this; | |
165 } | |
166 | |
167 ComplexDiagMatrix& | |
5275 | 168 ComplexDiagMatrix::fill (const ComplexColumnVector& a, octave_idx_type beg) |
458 | 169 { |
20232
a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
Carnë Draug <carandraug@octave.org>
parents:
19697
diff
changeset
|
170 octave_idx_type a_len = a.numel (); |
458 | 171 if (beg < 0 || beg + a_len >= length ()) |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
172 (*current_liboctave_error_handler) ("range error for fill"); |
458 | 173 |
5275 | 174 for (octave_idx_type i = 0; i < a_len; i++) |
458 | 175 elem (i+beg, i+beg) = a.elem (i); |
176 | |
177 return *this; | |
178 } | |
179 | |
180 ComplexDiagMatrix& | |
5275 | 181 ComplexDiagMatrix::fill (const RowVector& a, octave_idx_type beg) |
458 | 182 { |
20232
a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
Carnë Draug <carandraug@octave.org>
parents:
19697
diff
changeset
|
183 octave_idx_type a_len = a.numel (); |
458 | 184 if (beg < 0 || beg + a_len >= length ()) |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
185 (*current_liboctave_error_handler) ("range error for fill"); |
458 | 186 |
5275 | 187 for (octave_idx_type i = 0; i < a_len; i++) |
458 | 188 elem (i+beg, i+beg) = a.elem (i); |
189 | |
190 return *this; | |
191 } | |
192 | |
193 ComplexDiagMatrix& | |
5275 | 194 ComplexDiagMatrix::fill (const ComplexRowVector& a, octave_idx_type beg) |
458 | 195 { |
20232
a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
Carnë Draug <carandraug@octave.org>
parents:
19697
diff
changeset
|
196 octave_idx_type a_len = a.numel (); |
458 | 197 if (beg < 0 || beg + a_len >= length ()) |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
198 (*current_liboctave_error_handler) ("range error for fill"); |
458 | 199 |
5275 | 200 for (octave_idx_type i = 0; i < a_len; i++) |
458 | 201 elem (i+beg, i+beg) = a.elem (i); |
202 | |
203 return *this; | |
204 } | |
205 | |
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
206 DiagMatrix |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
207 ComplexDiagMatrix::abs (void) const |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
208 { |
15448
0a0912a9ab6e
Replace deprecated DiagArray2<T>::diag calls with DiagArray2<T>::extract_diag
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15271
diff
changeset
|
209 return DiagMatrix (extract_diag ().abs (), rows (), columns ()); |
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
210 } |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
211 |
458 | 212 ComplexDiagMatrix |
213 conj (const ComplexDiagMatrix& a) | |
214 { | |
15448
0a0912a9ab6e
Replace deprecated DiagArray2<T>::diag calls with DiagArray2<T>::extract_diag
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15271
diff
changeset
|
215 return ComplexDiagMatrix (conj (a.extract_diag ()), a.rows (), a.columns ()); |
458 | 216 } |
217 | |
218 // resize is the destructive analog for this one | |
219 | |
220 ComplexMatrix | |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
221 ComplexDiagMatrix::extract (octave_idx_type r1, octave_idx_type c1, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
222 octave_idx_type r2, octave_idx_type c2) const |
458 | 223 { |
17663
7975d75f933c
Use std::swap in liboctave instead of temporary variable.
Rik <rik@octave.org>
parents:
15448
diff
changeset
|
224 if (r1 > r2) { std::swap (r1, r2); } |
7975d75f933c
Use std::swap in liboctave instead of temporary variable.
Rik <rik@octave.org>
parents:
15448
diff
changeset
|
225 if (c1 > c2) { std::swap (c1, c2); } |
458 | 226 |
5275 | 227 octave_idx_type new_r = r2 - r1 + 1; |
228 octave_idx_type new_c = c2 - c1 + 1; | |
458 | 229 |
230 ComplexMatrix result (new_r, new_c); | |
231 | |
5275 | 232 for (octave_idx_type j = 0; j < new_c; j++) |
233 for (octave_idx_type i = 0; i < new_r; i++) | |
458 | 234 result.elem (i, j) = elem (r1+i, c1+j); |
235 | |
236 return result; | |
237 } | |
238 | |
239 // extract row or column i. | |
240 | |
241 ComplexRowVector | |
5275 | 242 ComplexDiagMatrix::row (octave_idx_type i) const |
458 | 243 { |
5275 | 244 octave_idx_type r = rows (); |
245 octave_idx_type c = cols (); | |
3504 | 246 if (i < 0 || i >= r) |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
247 (*current_liboctave_error_handler) ("invalid row selection"); |
458 | 248 |
3504 | 249 ComplexRowVector retval (c, 0.0); |
250 if (r <= c || (r > c && i < c)) | |
458 | 251 retval.elem (i) = elem (i, i); |
252 | |
253 return retval; | |
254 } | |
255 | |
256 ComplexRowVector | |
257 ComplexDiagMatrix::row (char *s) const | |
258 { | |
533 | 259 if (! s) |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
260 (*current_liboctave_error_handler) ("invalid row selection"); |
458 | 261 |
262 char c = *s; | |
263 if (c == 'f' || c == 'F') | |
5275 | 264 return row (static_cast<octave_idx_type>(0)); |
458 | 265 else if (c == 'l' || c == 'L') |
266 return row (rows () - 1); | |
267 else | |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
268 (*current_liboctave_error_handler) ("invalid row selection"); |
458 | 269 } |
270 | |
271 ComplexColumnVector | |
5275 | 272 ComplexDiagMatrix::column (octave_idx_type i) const |
458 | 273 { |
5275 | 274 octave_idx_type r = rows (); |
275 octave_idx_type c = cols (); | |
3504 | 276 if (i < 0 || i >= c) |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
277 (*current_liboctave_error_handler) ("invalid column selection"); |
458 | 278 |
3504 | 279 ComplexColumnVector retval (r, 0.0); |
280 if (r >= c || (r < c && i < r)) | |
458 | 281 retval.elem (i) = elem (i, i); |
282 | |
283 return retval; | |
284 } | |
285 | |
286 ComplexColumnVector | |
287 ComplexDiagMatrix::column (char *s) const | |
288 { | |
533 | 289 if (! s) |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
290 (*current_liboctave_error_handler) ("invalid column selection"); |
458 | 291 |
292 char c = *s; | |
293 if (c == 'f' || c == 'F') | |
5275 | 294 return column (static_cast<octave_idx_type>(0)); |
458 | 295 else if (c == 'l' || c == 'L') |
296 return column (cols () - 1); | |
297 else | |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
298 (*current_liboctave_error_handler) ("invalid column selection"); |
458 | 299 } |
300 | |
301 ComplexDiagMatrix | |
302 ComplexDiagMatrix::inverse (void) const | |
303 { | |
8811 | 304 octave_idx_type info; |
458 | 305 return inverse (info); |
306 } | |
307 | |
308 ComplexDiagMatrix | |
8811 | 309 ComplexDiagMatrix::inverse (octave_idx_type& info) const |
458 | 310 { |
5275 | 311 octave_idx_type r = rows (); |
312 octave_idx_type c = cols (); | |
3504 | 313 if (r != c) |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
314 (*current_liboctave_error_handler) ("inverse requires square matrix"); |
458 | 315 |
3504 | 316 ComplexDiagMatrix retval (r, c); |
458 | 317 |
318 info = 0; | |
5275 | 319 for (octave_idx_type i = 0; i < length (); i++) |
458 | 320 { |
321 if (elem (i, i) == 0.0) | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
322 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
323 info = -1; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
324 return *this; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
325 } |
458 | 326 else |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
327 retval.elem (i, i) = 1.0 / elem (i, i); |
458 | 328 } |
329 | |
1627 | 330 return retval; |
458 | 331 } |
332 | |
8840
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
333 ComplexDiagMatrix |
18467
c5a101de2d88
Allow pinv to work on Diagonal Matrices with a tolerance (bug #41546).
Rik <rik@octave.org>
parents:
18084
diff
changeset
|
334 ComplexDiagMatrix::pseudo_inverse (double tol) const |
8840
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
335 { |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
336 octave_idx_type r = rows (); |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
337 octave_idx_type c = cols (); |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
338 octave_idx_type len = length (); |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
339 |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
340 ComplexDiagMatrix retval (c, r); |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
341 |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
342 for (octave_idx_type i = 0; i < len; i++) |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
343 { |
18481
16b0cd465ecd
Handle special case of 0 for pinv with Diagonal matrices.
Rik <rik@octave.org>
parents:
18467
diff
changeset
|
344 double val = std::abs (elem (i, i)); |
18496
80b8873c90ba
Fix pinv bug with 0 values introduced in cset 16b0cd465ecd.
Rik <rik@octave.org>
parents:
18494
diff
changeset
|
345 if (val < tol || val == 0.0) |
18467
c5a101de2d88
Allow pinv to work on Diagonal Matrices with a tolerance (bug #41546).
Rik <rik@octave.org>
parents:
18084
diff
changeset
|
346 retval.elem (i, i) = 0.0; |
18496
80b8873c90ba
Fix pinv bug with 0 values introduced in cset 16b0cd465ecd.
Rik <rik@octave.org>
parents:
18494
diff
changeset
|
347 else |
18494 | 348 retval.elem (i, i) = 1.0 / elem (i, i); |
8840
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
349 } |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
350 |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
351 return retval; |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
352 } |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
353 |
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
354 bool |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
355 ComplexDiagMatrix::all_elements_are_real (void) const |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
356 { |
9825
7483fe200fab
narrow complex values with negative zero imaginary parts
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
357 return mx_inline_all_real (length (), data ()); |
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
358 } |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
359 |
458 | 360 // diagonal matrix by diagonal matrix -> diagonal matrix operations |
361 | |
362 ComplexDiagMatrix& | |
363 ComplexDiagMatrix::operator += (const DiagMatrix& a) | |
364 { | |
5275 | 365 octave_idx_type r = rows (); |
366 octave_idx_type c = cols (); | |
2386 | 367 |
5275 | 368 octave_idx_type a_nr = a.rows (); |
369 octave_idx_type a_nc = a.cols (); | |
2386 | 370 |
3504 | 371 if (r != a_nr || c != a_nc) |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
372 octave::err_nonconformant ("operator +=", r, c, a_nr, a_nc); |
458 | 373 |
3504 | 374 if (r == 0 || c == 0) |
458 | 375 return *this; |
376 | |
377 Complex *d = fortran_vec (); // Ensures only one reference to my privates! | |
378 | |
9550
3d6a9aea2aea
refactor binary & bool ops in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
9003
diff
changeset
|
379 mx_inline_add2 (length (), d, a.data ()); |
458 | 380 return *this; |
381 } | |
382 | |
383 ComplexDiagMatrix | |
384 operator * (const ComplexDiagMatrix& a, const DiagMatrix& b) | |
385 { | |
5275 | 386 octave_idx_type a_nr = a.rows (); |
387 octave_idx_type a_nc = a.cols (); | |
2386 | 388 |
5275 | 389 octave_idx_type b_nr = b.rows (); |
390 octave_idx_type b_nc = b.cols (); | |
2386 | 391 |
3504 | 392 if (a_nc != b_nr) |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
393 octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); |
458 | 394 |
3504 | 395 ComplexDiagMatrix c (a_nr, b_nc); |
458 | 396 |
18084
8e056300994b
Follow coding convention of defining and initializing only 1 variable per line in liboctave.
Rik <rik@octave.org>
parents:
17769
diff
changeset
|
397 octave_idx_type len = c.length (); |
23450
855122b993da
maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
398 octave_idx_type lenm = (len < a_nc ? len : a_nc); |
458 | 399 |
9698
7c6d5d8c8d37
fix diag*diag multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
9601
diff
changeset
|
400 for (octave_idx_type i = 0; i < lenm; i++) |
7c6d5d8c8d37
fix diag*diag multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
9601
diff
changeset
|
401 c.dgxelem (i) = a.dgelem (i) * b.dgelem (i); |
7c6d5d8c8d37
fix diag*diag multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
9601
diff
changeset
|
402 for (octave_idx_type i = lenm; i < len; i++) |
7c6d5d8c8d37
fix diag*diag multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
9601
diff
changeset
|
403 c.dgxelem (i) = 0.0; |
458 | 404 |
405 return c; | |
406 } | |
407 | |
408 ComplexDiagMatrix | |
1205 | 409 operator * (const DiagMatrix& a, const ComplexDiagMatrix& b) |
410 { | |
5275 | 411 octave_idx_type a_nr = a.rows (); |
412 octave_idx_type a_nc = a.cols (); | |
2386 | 413 |
5275 | 414 octave_idx_type b_nr = b.rows (); |
415 octave_idx_type b_nc = b.cols (); | |
2386 | 416 |
3504 | 417 if (a_nc != b_nr) |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
418 octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); |
1205 | 419 |
3504 | 420 if (a_nr == 0 || a_nc == 0 || b_nc == 0) |
421 return ComplexDiagMatrix (a_nr, a_nc, 0.0); | |
1205 | 422 |
3504 | 423 ComplexDiagMatrix c (a_nr, b_nc); |
1205 | 424 |
23450
855122b993da
maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
425 octave_idx_type len = (a_nr < b_nc ? a_nr : b_nc); |
1205 | 426 |
5275 | 427 for (octave_idx_type i = 0; i < len; i++) |
1205 | 428 { |
429 double a_element = a.elem (i, i); | |
430 Complex b_element = b.elem (i, i); | |
431 | |
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
432 c.elem (i, i) = a_element * b_element; |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
433 } |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
434 |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
435 return c; |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
436 } |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
437 |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
438 ComplexDiagMatrix |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
439 operator * (const ComplexDiagMatrix& a, const ComplexDiagMatrix& b) |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
440 { |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
441 octave_idx_type a_nr = a.rows (); |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
442 octave_idx_type a_nc = a.cols (); |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
443 |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
444 octave_idx_type b_nr = b.rows (); |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
445 octave_idx_type b_nc = b.cols (); |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
446 |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
447 if (a_nc != b_nr) |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22323
diff
changeset
|
448 octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); |
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
449 |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
450 if (a_nr == 0 || a_nc == 0 || b_nc == 0) |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
451 return ComplexDiagMatrix (a_nr, a_nc, 0.0); |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
452 |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
453 ComplexDiagMatrix c (a_nr, b_nc); |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
454 |
23450
855122b993da
maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
455 octave_idx_type len = (a_nr < b_nc ? a_nr : b_nc); |
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
456 |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
457 for (octave_idx_type i = 0; i < len; i++) |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
458 { |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
459 Complex a_element = a.elem (i, i); |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
460 Complex b_element = b.elem (i, i); |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
461 |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
462 c.elem (i, i) = a_element * b_element; |
1205 | 463 } |
464 | |
465 return c; | |
466 } | |
467 | |
458 | 468 // other operations |
469 | |
8371
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
470 ComplexDET |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
471 ComplexDiagMatrix::determinant (void) const |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
472 { |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
473 ComplexDET det (1.0); |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
474 if (rows () != cols ()) |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
475 (*current_liboctave_error_handler) ("determinant requires square matrix"); |
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
476 |
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
477 octave_idx_type len = length (); |
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
478 for (octave_idx_type i = 0; i < len; i++) |
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
21129
diff
changeset
|
479 det *= elem (i, i); |
8371
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
480 |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
481 return det; |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
482 } |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
483 |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
484 double |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
485 ComplexDiagMatrix::rcond (void) const |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
486 { |
15448
0a0912a9ab6e
Replace deprecated DiagArray2<T>::diag calls with DiagArray2<T>::extract_diag
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15271
diff
changeset
|
487 ColumnVector av = extract_diag (0).map<double> (std::abs); |
18084
8e056300994b
Follow coding convention of defining and initializing only 1 variable per line in liboctave.
Rik <rik@octave.org>
parents:
17769
diff
changeset
|
488 double amx = av.max (); |
8e056300994b
Follow coding convention of defining and initializing only 1 variable per line in liboctave.
Rik <rik@octave.org>
parents:
17769
diff
changeset
|
489 double amn = av.min (); |
8371
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
490 return amx == 0 ? 0.0 : amn / amx; |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
491 } |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
492 |
458 | 493 // i/o |
494 | |
3504 | 495 std::ostream& |
496 operator << (std::ostream& os, const ComplexDiagMatrix& a) | |
458 | 497 { |
498 Complex ZERO (0.0); | |
499 // int field_width = os.precision () + 7; | |
5275 | 500 for (octave_idx_type i = 0; i < a.rows (); i++) |
458 | 501 { |
5275 | 502 for (octave_idx_type j = 0; j < a.cols (); j++) |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
503 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
504 if (i == j) |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23461
diff
changeset
|
505 os << ' ' /* setw (field_width) */ << a.elem (i, i); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
506 else |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23461
diff
changeset
|
507 os << ' ' /* setw (field_width) */ << ZERO; |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
508 } |
458 | 509 os << "\n"; |
510 } | |
511 return os; | |
512 } |