Mercurial > hg > octave-nkf
annotate liboctave/dDiagMatrix.cc @ 10396:a0b51ac0f88a
optimize accumdim with summation
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Fri, 05 Mar 2010 12:31:30 +0100 |
parents | a0728e81ed25 |
children | fd0a3ac60b0e |
rev | line source |
---|---|
1993 | 1 // DiagMatrix manipulations. |
458 | 2 /* |
3 | |
7017 | 4 Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, |
8920 | 5 2005, 2007, 2008, 2009 John W. Eaton |
9601
a9b37bae1802
add a couple of missing copyright statements
Jaroslav Hajek <highegg@gmail.com>
parents:
9550
diff
changeset
|
6 Copyright (C) 2009 VZLU Prague |
458 | 7 |
8 This file is part of Octave. | |
9 | |
10 Octave is free software; you can redistribute it and/or modify it | |
11 under the terms of the GNU General Public License as published by the | |
7016 | 12 Free Software Foundation; either version 3 of the License, or (at your |
13 option) any later version. | |
458 | 14 |
15 Octave is distributed in the hope that it will be useful, but WITHOUT | |
16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
18 for more details. | |
19 | |
20 You should have received a copy of the GNU General Public License | |
7016 | 21 along with Octave; see the file COPYING. If not, see |
22 <http://www.gnu.org/licenses/>. | |
458 | 23 |
24 */ | |
25 | |
26 #ifdef HAVE_CONFIG_H | |
1192 | 27 #include <config.h> |
458 | 28 #endif |
29 | |
3503 | 30 #include <iostream> |
458 | 31 |
4669 | 32 #include "Array-util.h" |
1368 | 33 #include "lo-error.h" |
458 | 34 #include "mx-base.h" |
35 #include "mx-inlines.cc" | |
1650 | 36 #include "oct-cmplx.h" |
458 | 37 |
1360 | 38 // Diagonal Matrix class. |
458 | 39 |
2385 | 40 bool |
458 | 41 DiagMatrix::operator == (const DiagMatrix& a) const |
42 { | |
43 if (rows () != a.rows () || cols () != a.cols ()) | |
44 return 0; | |
45 | |
9550
3d6a9aea2aea
refactor binary & bool ops in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
46 return mx_inline_equal (length (), data (), a.data ()); |
458 | 47 } |
48 | |
2385 | 49 bool |
458 | 50 DiagMatrix::operator != (const DiagMatrix& a) const |
51 { | |
52 return !(*this == a); | |
53 } | |
54 | |
55 DiagMatrix& | |
56 DiagMatrix::fill (double val) | |
57 { | |
5275 | 58 for (octave_idx_type i = 0; i < length (); i++) |
458 | 59 elem (i, i) = val; |
60 return *this; | |
61 } | |
62 | |
63 DiagMatrix& | |
5275 | 64 DiagMatrix::fill (double val, octave_idx_type beg, octave_idx_type end) |
458 | 65 { |
66 if (beg < 0 || end >= length () || end < beg) | |
67 { | |
68 (*current_liboctave_error_handler) ("range error for fill"); | |
69 return *this; | |
70 } | |
71 | |
5275 | 72 for (octave_idx_type i = beg; i <= end; i++) |
458 | 73 elem (i, i) = val; |
74 | |
75 return *this; | |
76 } | |
77 | |
78 DiagMatrix& | |
79 DiagMatrix::fill (const ColumnVector& a) | |
80 { | |
5275 | 81 octave_idx_type len = length (); |
458 | 82 if (a.length () != len) |
83 { | |
84 (*current_liboctave_error_handler) ("range error for fill"); | |
85 return *this; | |
86 } | |
87 | |
5275 | 88 for (octave_idx_type i = 0; i < len; i++) |
458 | 89 elem (i, i) = a.elem (i); |
90 | |
91 return *this; | |
92 } | |
93 | |
94 DiagMatrix& | |
95 DiagMatrix::fill (const RowVector& a) | |
96 { | |
5275 | 97 octave_idx_type len = length (); |
458 | 98 if (a.length () != len) |
99 { | |
100 (*current_liboctave_error_handler) ("range error for fill"); | |
101 return *this; | |
102 } | |
103 | |
5275 | 104 for (octave_idx_type i = 0; i < len; i++) |
458 | 105 elem (i, i) = a.elem (i); |
106 | |
107 return *this; | |
108 } | |
109 | |
110 DiagMatrix& | |
5275 | 111 DiagMatrix::fill (const ColumnVector& a, octave_idx_type beg) |
458 | 112 { |
5275 | 113 octave_idx_type a_len = a.length (); |
458 | 114 if (beg < 0 || beg + a_len >= length ()) |
115 { | |
116 (*current_liboctave_error_handler) ("range error for fill"); | |
117 return *this; | |
118 } | |
119 | |
5275 | 120 for (octave_idx_type i = 0; i < a_len; i++) |
458 | 121 elem (i+beg, i+beg) = a.elem (i); |
122 | |
123 return *this; | |
124 } | |
125 | |
126 DiagMatrix& | |
5275 | 127 DiagMatrix::fill (const RowVector& a, octave_idx_type beg) |
458 | 128 { |
5275 | 129 octave_idx_type a_len = a.length (); |
458 | 130 if (beg < 0 || beg + a_len >= length ()) |
131 { | |
132 (*current_liboctave_error_handler) ("range error for fill"); | |
133 return *this; | |
134 } | |
135 | |
5275 | 136 for (octave_idx_type i = 0; i < a_len; i++) |
458 | 137 elem (i+beg, i+beg) = a.elem (i); |
138 | |
139 return *this; | |
140 } | |
141 | |
142 DiagMatrix | |
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7924
diff
changeset
|
143 DiagMatrix::abs (void) const |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7924
diff
changeset
|
144 { |
10363
a0728e81ed25
improve diag matrix interface & implementation
Jaroslav Hajek <highegg@gmail.com>
parents:
10314
diff
changeset
|
145 return DiagMatrix (diag ().abs (), rows (), columns ()); |
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7924
diff
changeset
|
146 } |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7924
diff
changeset
|
147 |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7924
diff
changeset
|
148 DiagMatrix |
1205 | 149 real (const ComplexDiagMatrix& a) |
150 { | |
10363
a0728e81ed25
improve diag matrix interface & implementation
Jaroslav Hajek <highegg@gmail.com>
parents:
10314
diff
changeset
|
151 return DiagMatrix (real (a.diag ()), a.rows (), a.cols ()); |
1205 | 152 } |
153 | |
154 DiagMatrix | |
155 imag (const ComplexDiagMatrix& a) | |
156 { | |
10363
a0728e81ed25
improve diag matrix interface & implementation
Jaroslav Hajek <highegg@gmail.com>
parents:
10314
diff
changeset
|
157 return DiagMatrix (imag (a.diag ()), a.rows (), a.cols ()); |
1205 | 158 } |
159 | |
458 | 160 Matrix |
5275 | 161 DiagMatrix::extract (octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2) const |
458 | 162 { |
5275 | 163 if (r1 > r2) { octave_idx_type tmp = r1; r1 = r2; r2 = tmp; } |
164 if (c1 > c2) { octave_idx_type tmp = c1; c1 = c2; c2 = tmp; } | |
458 | 165 |
5275 | 166 octave_idx_type new_r = r2 - r1 + 1; |
167 octave_idx_type new_c = c2 - c1 + 1; | |
458 | 168 |
169 Matrix result (new_r, new_c); | |
170 | |
5275 | 171 for (octave_idx_type j = 0; j < new_c; j++) |
172 for (octave_idx_type i = 0; i < new_r; i++) | |
458 | 173 result.elem (i, j) = elem (r1+i, c1+j); |
174 | |
175 return result; | |
176 } | |
177 | |
178 // extract row or column i. | |
179 | |
180 RowVector | |
5275 | 181 DiagMatrix::row (octave_idx_type i) const |
458 | 182 { |
5275 | 183 octave_idx_type r = rows (); |
184 octave_idx_type c = cols (); | |
3504 | 185 if (i < 0 || i >= r) |
458 | 186 { |
187 (*current_liboctave_error_handler) ("invalid row selection"); | |
188 return RowVector (); | |
189 } | |
190 | |
3504 | 191 RowVector retval (c, 0.0); |
192 if (r <= c || (r > c && i < c)) | |
458 | 193 retval.elem (i) = elem (i, i); |
194 | |
195 return retval; | |
196 } | |
197 | |
198 RowVector | |
199 DiagMatrix::row (char *s) const | |
200 { | |
533 | 201 if (! s) |
458 | 202 { |
203 (*current_liboctave_error_handler) ("invalid row selection"); | |
204 return RowVector (); | |
205 } | |
206 | |
207 char c = *s; | |
208 if (c == 'f' || c == 'F') | |
5275 | 209 return row (static_cast<octave_idx_type>(0)); |
458 | 210 else if (c == 'l' || c == 'L') |
211 return row (rows () - 1); | |
212 else | |
213 { | |
214 (*current_liboctave_error_handler) ("invalid row selection"); | |
215 return RowVector (); | |
216 } | |
217 } | |
218 | |
219 ColumnVector | |
5275 | 220 DiagMatrix::column (octave_idx_type i) const |
458 | 221 { |
5275 | 222 octave_idx_type r = rows (); |
223 octave_idx_type c = cols (); | |
3504 | 224 if (i < 0 || i >= c) |
458 | 225 { |
226 (*current_liboctave_error_handler) ("invalid column selection"); | |
227 return ColumnVector (); | |
228 } | |
229 | |
3504 | 230 ColumnVector retval (r, 0.0); |
231 if (r >= c || (r < c && i < r)) | |
458 | 232 retval.elem (i) = elem (i, i); |
233 | |
234 return retval; | |
235 } | |
236 | |
237 ColumnVector | |
238 DiagMatrix::column (char *s) const | |
239 { | |
533 | 240 if (! s) |
458 | 241 { |
242 (*current_liboctave_error_handler) ("invalid column selection"); | |
243 return ColumnVector (); | |
244 } | |
245 | |
246 char c = *s; | |
247 if (c == 'f' || c == 'F') | |
5275 | 248 return column (static_cast<octave_idx_type>(0)); |
458 | 249 else if (c == 'l' || c == 'L') |
250 return column (cols () - 1); | |
251 else | |
252 { | |
253 (*current_liboctave_error_handler) ("invalid column selection"); | |
254 return ColumnVector (); | |
255 } | |
256 } | |
257 | |
258 DiagMatrix | |
259 DiagMatrix::inverse (void) const | |
260 { | |
8811 | 261 octave_idx_type info; |
458 | 262 return inverse (info); |
263 } | |
264 | |
265 DiagMatrix | |
8811 | 266 DiagMatrix::inverse (octave_idx_type &info) const |
458 | 267 { |
5275 | 268 octave_idx_type r = rows (); |
269 octave_idx_type c = cols (); | |
270 octave_idx_type len = length (); | |
3504 | 271 if (r != c) |
458 | 272 { |
273 (*current_liboctave_error_handler) ("inverse requires square matrix"); | |
274 return DiagMatrix (); | |
275 } | |
276 | |
3504 | 277 DiagMatrix retval (r, c); |
1627 | 278 |
458 | 279 info = 0; |
5275 | 280 for (octave_idx_type i = 0; i < len; i++) |
458 | 281 { |
282 if (elem (i, i) == 0.0) | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
283 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
284 info = -1; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
285 return *this; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
286 } |
458 | 287 else |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
288 retval.elem (i, i) = 1.0 / elem (i, i); |
458 | 289 } |
290 | |
1627 | 291 return retval; |
458 | 292 } |
293 | |
8840
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
294 DiagMatrix |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
295 DiagMatrix::pseudo_inverse (void) const |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
296 { |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
297 octave_idx_type r = rows (); |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
298 octave_idx_type c = cols (); |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
299 octave_idx_type len = length (); |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
300 |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
301 DiagMatrix retval (c, r); |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
302 |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
303 for (octave_idx_type i = 0; i < len; i++) |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
304 { |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
305 if (elem (i, i) != 0.0) |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
306 retval.elem (i, i) = 1.0 / elem (i, i); |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
307 else |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
308 retval.elem (i, i) = 0.0; |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
309 } |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
310 |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
311 return retval; |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
312 } |
c690e3772583
support diagonal matrices in pinv
Jaroslav Hajek <highegg@gmail.com>
parents:
8811
diff
changeset
|
313 |
458 | 314 // diagonal matrix by diagonal matrix -> diagonal matrix operations |
315 | |
316 // diagonal matrix by diagonal matrix -> diagonal matrix operations | |
317 | |
318 DiagMatrix | |
319 operator * (const DiagMatrix& a, const DiagMatrix& b) | |
320 { | |
5275 | 321 octave_idx_type a_nr = a.rows (); |
322 octave_idx_type a_nc = a.cols (); | |
2385 | 323 |
5275 | 324 octave_idx_type b_nr = b.rows (); |
325 octave_idx_type b_nc = b.cols (); | |
2385 | 326 |
3504 | 327 if (a_nc != b_nr) |
9698
7c6d5d8c8d37
fix diag*diag multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
9601
diff
changeset
|
328 gripe_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); |
458 | 329 |
3504 | 330 DiagMatrix c (a_nr, b_nc); |
458 | 331 |
9698
7c6d5d8c8d37
fix diag*diag multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
9601
diff
changeset
|
332 octave_idx_type len = c.length (), lenm = len < a_nc ? len : a_nc; |
458 | 333 |
9698
7c6d5d8c8d37
fix diag*diag multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
9601
diff
changeset
|
334 for (octave_idx_type i = 0; i < lenm; i++) |
7c6d5d8c8d37
fix diag*diag multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
9601
diff
changeset
|
335 c.dgxelem (i) = a.dgelem (i) * b.dgelem (i); |
7c6d5d8c8d37
fix diag*diag multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
9601
diff
changeset
|
336 for (octave_idx_type i = lenm; i < len; i++) |
7c6d5d8c8d37
fix diag*diag multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
9601
diff
changeset
|
337 c.dgxelem (i) = 0.0; |
458 | 338 |
339 return c; | |
340 } | |
341 | |
342 // other operations | |
343 | |
8371
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
344 DET |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
345 DiagMatrix::determinant (void) const |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
346 { |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
347 DET det (1.0); |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
348 if (rows () != cols ()) |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
349 { |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
350 (*current_liboctave_error_handler) ("determinant requires square matrix"); |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
351 det = 0.0; |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
352 } |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
353 else |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
354 { |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
355 octave_idx_type len = length (); |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
356 for (octave_idx_type i = 0; i < len; i++) |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
357 det *= elem (i, i); |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
358 } |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
359 |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
360 return det; |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
361 } |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
362 |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
363 double |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
364 DiagMatrix::rcond (void) const |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
365 { |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9698
diff
changeset
|
366 ColumnVector av = diag (0).map<double> (fabs); |
8371
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
367 double amx = av.max (), amn = av.min (); |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
368 return amx == 0 ? 0.0 : amn / amx; |
c3f7e2549abb
make det & inv aware of diagonal & permutation matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
369 } |
8367
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
370 |
3504 | 371 std::ostream& |
372 operator << (std::ostream& os, const DiagMatrix& a) | |
458 | 373 { |
374 // int field_width = os.precision () + 7; | |
1360 | 375 |
5275 | 376 for (octave_idx_type i = 0; i < a.rows (); i++) |
458 | 377 { |
5275 | 378 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
|
379 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
380 if (i == j) |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
381 os << " " /* setw (field_width) */ << a.elem (i, i); |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
382 else |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
383 os << " " /* setw (field_width) */ << 0.0; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
384 } |
458 | 385 os << "\n"; |
386 } | |
387 return os; | |
388 } |