Mercurial > octave-nkf

diff libinterp/corefcn/graphics.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 350cad34b0f8
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc	Sat Jul 13 10:28:57 2013 +0200
+++ b/libinterp/corefcn/graphics.cc	Sat Jul 13 08:08:15 2013 -0700
@@ -5491,8 +5491,7 @@
       double min_pos = octave_Inf;
       double max_neg = -octave_Inf;
       get_children_limits (minval, maxval, min_pos, max_neg, kids, limit_type);
-      if (!xisinf (minval) && !xisnan (minval)
-          && !xisinf (maxval) && !xisnan (maxval))
+      if (xfinite (minval) && xfinite (maxval))
         {
           limits(0) = minval;
           limits(1) = maxval;
@@ -5973,16 +5972,16 @@
                   const array_property& data)
 {
   double val = data.min_val ();
-  if (! (xisinf (val) || xisnan (val)) && val < min_val)
+  if (xfinite (val) && val < min_val)
     min_val = val;
   val = data.max_val ();
-  if (! (xisinf (val) || xisnan (val)) && val > max_val)
+  if (xfinite (val) && val > max_val)
     max_val = val;
   val = data.min_pos ();
-  if (! (xisinf (val) || xisnan (val)) && val > 0 && val < min_pos)
+  if (xfinite (val) && val > 0 && val < min_pos)
     min_pos = val;
   val = data.max_neg ();
-  if (! (xisinf (val) || xisnan (val)) && val < 0 && val > max_neg)
+  if (xfinite (val) && val < 0 && val > max_neg)
     max_neg = val;
 }
 */
@@ -6001,19 +6000,19 @@
           double val;
 
           val = m(0);
-          if (! (xisinf (val) || xisnan (val)) && val < min_val)
+          if (xfinite (val) && val < min_val)
             min_val = val;
 
           val = m(1);
-          if (! (xisinf (val) || xisnan (val)) && val > max_val)
+          if (xfinite (val) && val > max_val)
             max_val = val;
 
           val = m(2);
-          if (! (xisinf (val) || xisnan (val)) && val > 0 && val < min_pos)
+          if (xfinite (val) && val > 0 && val < min_pos)
             min_pos = val;
 
           val = m(3);
-          if (! (xisinf (val) || xisnan (val)) && val < 0 && val > max_neg)
+          if (xfinite (val) && val < 0 && val > max_neg)
             max_neg = val;
         }
     }
@@ -6478,16 +6477,16 @@
   if (limits.numel () == 4) \
     { \
       val = limits(0); \
-      if (! (xisinf (val) || xisnan (val))) \
+      if (xfinite (val)) \
         min_val = val; \
       val = limits(1); \
-      if (! (xisinf (val) || xisnan (val))) \
+      if (xfinite (val)) \
         max_val = val; \
       val = limits(2); \
-      if (! (xisinf (val) || xisnan (val))) \
+      if (xfinite (val)) \
         min_pos = val; \
       val = limits(3); \
-      if (! (xisinf (val) || xisnan (val))) \
+      if (xfinite (val)) \
         max_neg = val; \
     } \
   else \
@@ -7451,16 +7450,16 @@
   if (limits.numel () == 4)
     {
       val = limits(0);
-      if (! (xisinf (val) || xisnan (val)))
+      if (xfinite (val))
         min_val = val;
       val = limits(1);
-      if (! (xisinf (val) || xisnan (val)))
+      if (xfinite (val))
         max_val = val;
       val = limits(2);
-      if (! (xisinf (val) || xisnan (val)))
+      if (xfinite (val))
         min_pos = val;
       val = limits(3);
-      if (! (xisinf (val) || xisnan (val)))
+      if (xfinite (val))
         max_neg = val;
     }
   else