Mercurial > octave-nkf
changeset 5748:8510034588a7
[project @ 2006-04-07 07:51:59 by jwe]
| author | jwe |
|---|---|
| date | Fri, 07 Apr 2006 07:51:59 +0000 |
| parents | b09d4d0f5b63 |
| children | 26beffa9f66f |
| files | src/ChangeLog src/pr-output.cc |
| diffstat | 2 files changed, 54 insertions(+), 54 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Apr 07 06:43:11 2006 +0000 +++ b/src/ChangeLog Fri Apr 07 07:51:59 2006 +0000 @@ -1,5 +1,9 @@ 2006-04-07 John W. Eaton <jwe@octave.org> + * pr-output.cc (pr_max_internal, pr_min_internal): + Return 0 if all values are Inf or NaN. + Always leave space for sign when printing Inf or NaN values. + * parse.y (Fmfilename): Don't let filenames like ../foo fake us out. * data.cc (fill_matrix): Create separate versions for int, bool,
--- a/src/pr-output.cc Fri Apr 07 06:43:11 2006 +0000 +++ b/src/pr-output.cc Fri Apr 07 07:51:59 2006 +0000 @@ -233,6 +233,8 @@ double result = -DBL_MAX; + bool all_inf_or_nan = true; + for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { @@ -240,10 +242,15 @@ if (xisinf (val) || xisnan (val)) continue; + all_inf_or_nan = false; + if (val > result) result = val; } + if (all_inf_or_nan) + result = 0.0; + return result; } @@ -255,6 +262,8 @@ double result = DBL_MAX; + bool all_inf_or_nan = true; + for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { @@ -262,10 +271,15 @@ if (xisinf (val) || xisnan (val)) continue; + all_inf_or_nan = false; + if (val < result) result = val; } + if (all_inf_or_nan) + result = 0.0; + return result; } @@ -285,9 +299,8 @@ if (bank_format) { fw = digits < 0 ? 4 : digits + 3; - if (inf_or_nan && fw < 3) - fw = 3; - fw += sign; + if (inf_or_nan && fw < 4) + fw = 4; rd = 2; } else if (hex_format) @@ -303,9 +316,8 @@ else if (inf_or_nan || int_only) { fw = digits; - if (inf_or_nan && fw < 3) - fw = 3; - fw += sign; + if (inf_or_nan && fw < 4) + fw = 4; rd = fw; } else @@ -324,9 +336,8 @@ } fw = ld + 1 + rd; - if (inf_or_nan && fw < 3) - fw = 3; - fw += sign; + if (inf_or_nan && fw < 4) + fw = 4; } if (! (bank_format || hex_format || bit_format) @@ -341,9 +352,8 @@ exp_field++; fw = 2 + prec + exp_field; - if (inf_or_nan && fw < 3) - fw = 3; - fw += sign; + if (inf_or_nan && fw < 4) + fw = 4; fmt = float_format (fw, prec - 1, std::ios::scientific); } @@ -403,9 +413,8 @@ { int digits = x_max > x_min ? x_max : x_min; fw = digits <= 0 ? 4 : digits + 3; - if (inf_or_nan && fw < 3) - fw = 3; - fw += sign; + if (inf_or_nan && fw < 4) + fw = 4; rd = 2; } else if (hex_format) @@ -422,17 +431,15 @@ { rd = prec; fw = rd + 2; - if (inf_or_nan && fw < 3) - fw = 3; - fw += sign; + if (inf_or_nan && fw < 4) + fw = 4; } else if (int_or_inf_or_nan) { int digits = x_max > x_min ? x_max : x_min; fw = digits <= 0 ? 1 : digits; - if (inf_or_nan && fw < 3) - fw = 3; - fw += sign; + if (inf_or_nan && fw < 4) + fw = 4; rd = fw; } else @@ -469,9 +476,8 @@ rd = rd_max > rd_min ? rd_max : rd_min; fw = ld + 1 + rd; - if (inf_or_nan && fw < 3) - fw = 3; - fw += sign; + if (inf_or_nan && fw < 4) + fw = 4; } if (! (bank_format || hex_format || bit_format) @@ -488,9 +494,8 @@ exp_field++; fw = 2 + prec + exp_field; - if (inf_or_nan && fw < 3) - fw = 3; - fw += sign; + if (inf_or_nan && fw < 4) + fw = 4; fmt = float_format (fw, prec - 1, std::ios::scientific); } @@ -561,9 +566,8 @@ int digits = r_x; i_fw = 0; r_fw = digits <= 0 ? 4 : digits + 3; - if (inf_or_nan && r_fw < 3) - r_fw = 3; - r_fw += sign; + if (inf_or_nan && r_fw < 4) + r_fw = 4; rd = 2; } else if (hex_format) @@ -582,9 +586,8 @@ { int digits = x_max > x_min ? x_max : x_min; i_fw = r_fw = digits <= 0 ? 1 : digits; - if (inf_or_nan && i_fw < 3) - i_fw = r_fw = 3; - r_fw += sign; + if (inf_or_nan && i_fw < 4) + i_fw = r_fw = 4; rd = r_fw; } else @@ -621,9 +624,8 @@ rd = rd_max > rd_min ? rd_max : rd_min; i_fw = r_fw = ld + 1 + rd; - if (inf_or_nan && i_fw < 3) - i_fw = r_fw = 3; - r_fw += sign; + if (inf_or_nan && i_fw < 4) + i_fw = r_fw = 4; } if (! (bank_format || hex_format || bit_format) @@ -641,9 +643,8 @@ exp_field++; i_fw = r_fw = 1 + prec + exp_field; - if (inf_or_nan && i_fw < 3) - i_fw = r_fw = 3; - r_fw += sign; + if (inf_or_nan && i_fw < 4) + i_fw = r_fw = 4; r_fmt = float_format (r_fw, prec - 1, std::ios::scientific); i_fmt = float_format (i_fw, prec - 1, std::ios::scientific); @@ -738,9 +739,8 @@ int digits = r_x_max > r_x_min ? r_x_max : r_x_min; i_fw = 0; r_fw = digits <= 0 ? 4 : digits + 3; - if (inf_or_nan && i_fw < 3) - i_fw = r_fw = 3; - r_fw += sign; + if (inf_or_nan && i_fw < 4) + i_fw = r_fw = 4; rd = 2; } else if (hex_format) @@ -759,17 +759,15 @@ { rd = prec; i_fw = r_fw = rd + 2; - if (inf_or_nan && i_fw < 3) - i_fw = r_fw = 3; - r_fw += sign; + if (inf_or_nan && i_fw < 4) + i_fw = r_fw = 4; } else if (int_or_inf_or_nan) { int digits = x_max > x_min ? x_max : x_min; i_fw = r_fw = digits <= 0 ? 1 : digits; - if (inf_or_nan && i_fw < 3) - i_fw = r_fw = 3; - r_fw += sign; + if (inf_or_nan && i_fw < 4) + i_fw = r_fw = 4; rd = r_fw; } else @@ -806,9 +804,8 @@ rd = rd_max > rd_min ? rd_max : rd_min; i_fw = r_fw = ld + 1 + rd; - if (inf_or_nan && i_fw < 3) - i_fw = r_fw = 3; - r_fw += sign; + if (inf_or_nan && i_fw < 4) + i_fw = r_fw = 4; } if (! (bank_format || hex_format || bit_format) @@ -828,9 +825,8 @@ exp_field++; i_fw = r_fw = 1 + prec + exp_field; - if (inf_or_nan && i_fw < 3) - i_fw = r_fw = 3; - r_fw += sign; + if (inf_or_nan && i_fw < 4) + i_fw = r_fw = 4; r_fmt = float_format (r_fw, prec - 1, std::ios::scientific); i_fmt = float_format (i_fw, prec - 1, std::ios::scientific);