Mercurial > octave-nkf
comparison src/pr-output.cc @ 5030:160365410ad4
[project @ 2004-09-24 03:22:23 by jwe]
author | jwe |
---|---|
date | Fri, 24 Sep 2004 03:22:24 +0000 |
parents | f6b63ff1119b |
children | 55f5b61d74b7 |
comparison
equal
deleted
inserted
replaced
5029:1ec26bdb120c | 5030:160365410ad4 |
---|---|
1345 if (! compact_format) | 1345 if (! compact_format) |
1346 os << "\n"; | 1346 os << "\n"; |
1347 } | 1347 } |
1348 } | 1348 } |
1349 | 1349 |
1350 template <class T> | |
1350 static inline void | 1351 static inline void |
1351 pr_plus_format (std::ostream& os, double d) | 1352 pr_plus_format (std::ostream& os, const T& val) |
1352 { | 1353 { |
1353 if (d > 0.0) | 1354 if (val > T (0)) |
1354 os << plus_format_chars[0]; | 1355 os << plus_format_chars[0]; |
1355 else if (d < 0.0) | 1356 else if (val < T (0)) |
1356 os << plus_format_chars[1]; | 1357 os << plus_format_chars[1]; |
1357 else | 1358 else |
1358 os << plus_format_chars[2]; | 1359 os << plus_format_chars[2]; |
1359 } | 1360 } |
1360 | 1361 |
1597 PRINT_ND_ARRAY (os, nda, NDArray, double, Matrix); | 1598 PRINT_ND_ARRAY (os, nda, NDArray, double, Matrix); |
1598 break; | 1599 break; |
1599 } | 1600 } |
1600 } | 1601 } |
1601 | 1602 |
1603 template <> | |
1602 static inline void | 1604 static inline void |
1603 pr_plus_format (std::ostream& os, const Complex& c) | 1605 pr_plus_format (std::ostream& os, const Complex& c) |
1604 { | 1606 { |
1605 double rp = c.real (); | 1607 double rp = c.real (); |
1606 double ip = c.imag (); | 1608 double ip = c.imag (); |
2466 pr_plus_format (os, val); | 2468 pr_plus_format (os, val); |
2467 } | 2469 } |
2468 else | 2470 else |
2469 { | 2471 { |
2470 if (free_format) | 2472 if (free_format) |
2471 os << typename octave_print_conv<T>::print_conv_type (val); | 2473 os << typename octave_print_conv<octave_int<T> >::print_conv_type (val); |
2472 else | 2474 else |
2473 pr_int (os, val); | 2475 pr_int (os, val); |
2474 } | 2476 } |
2475 } | 2477 } |
2476 | 2478 |