Mercurial > hg > octave-nkf

diff libinterp/corefcn/pr-output.cc @ 16971:259c1f295a1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use xfinite to replace some (isinf || isnan) instances in C++ code. * libinterp/corefcn/graphics.cc(max_axes_scale, check_limit_vals, FIX_LIMITS, update_axis_limits): Use xfinite. * libinterp/corefcn/ls-mat5.cc(save_mat5_array_length): Use xfinite. * libinterp/corefcn/pr-output.cc(pr_max_internal, pr_min_internal, set_format): Use xfinite. * liboctave/numeric/lo-mappers.h(X_NINT): Use xfinite. * liboctave/numeric/oct-rand.cc(do_scalar, do_float_scalar, fill): Use xfinite. * liboctave/util/lo-utils.cc(xtoo_large_for_float): Use xfinite.
author Rik <rik@octave.org>
date Sat, 13 Jul 2013 08:08:15 -0700
parents 68fc671a9339
children d6499c14021c
line wrap: on
line diff
--- a/libinterp/corefcn/pr-output.cc
+++ b/libinterp/corefcn/pr-output.cc
@@ -493,7 +493,7 @@
     for (octave_idx_type i = 0; i < nr; i++)
       {
         double val = m(i,j);
-        if (xisinf (val) || xisnan (val))
+        if (! xfinite (val))
           continue;
 
         all_inf_or_nan = false;
@@ -522,7 +522,7 @@
     for (octave_idx_type i = 0; i < nr; i++)
       {
         double val = m(i,j);
-        if (xisinf (val) || xisnan (val))
+        if (xfinite (val))
           continue;
 
         all_inf_or_nan = false;
@@ -998,11 +998,9 @@
   double r_abs = rp < 0.0 ? -rp : rp;
   double i_abs = ip < 0.0 ? -ip : ip;
 
-  int r_x = (xisinf (rp) || xisnan (rp) || r_abs == 0.0)
-    ? 0 : num_digits (r_abs);
-
-  int i_x = (xisinf (ip) || xisnan (ip) || i_abs == 0.0)
-    ? 0 : num_digits (i_abs);
+  int r_x = (! xfinite (rp) || r_abs == 0.0) ? 0 : num_digits (r_abs);
+
+  int i_x = (! xfinite (ip) || i_abs == 0.0) ? 0 : num_digits (i_abs);
 
   int x_max, x_min;