Mercurial > octave-nkf

diff liboctave/dNDArray.cc @ 5389:25c8956d2204

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2005-06-15 03:45:46 by jwe]
author jwe
date Wed, 15 Jun 2005 03:45:49 +0000
parents 5b00a8beb504
children ace8d8d26933
line wrap: on
line diff
--- a/liboctave/dNDArray.cc	Tue Jun 14 20:04:31 2005 +0000
+++ b/liboctave/dNDArray.cc	Wed Jun 15 03:45:49 2005 +0000
@@ -589,7 +589,7 @@
     {
       double val = elem (i);
 
-      if (! (octave_is_NaN_or_NA (val) || xisinf (val))
+      if (! (xisnan (val) || xisinf (val))
 	  && fabs (val) > FLT_MAX)
 	return true;
     }
@@ -694,7 +694,7 @@
 	{
 	  tmp_max = elem (idx_j * x_stride + x_offset);
 	  
-	  if (! octave_is_NaN_or_NA (tmp_max))
+	  if (! xisnan (tmp_max))
 	    break;
 	}
 
@@ -702,7 +702,7 @@
 	{
 	  double tmp = elem (j * x_stride + x_offset);
 
-	  if (octave_is_NaN_or_NA (tmp))
+	  if (xisnan (tmp))
 	    continue;
 	  else if (tmp > tmp_max)
 	    {
@@ -712,7 +712,7 @@
 	}
 
       result.elem (i) = tmp_max;
-      idx_arg.elem (i) = octave_is_NaN_or_NA (tmp_max) ? 0 : idx_j;
+      idx_arg.elem (i) = xisnan (tmp_max) ? 0 : idx_j;
     }
 
   return result;
@@ -769,7 +769,7 @@
 	{
 	  tmp_min = elem (idx_j * x_stride + x_offset);
 	  
-	  if (! octave_is_NaN_or_NA (tmp_min))
+	  if (! xisnan (tmp_min))
 	    break;
 	}
 
@@ -777,7 +777,7 @@
 	{
 	  double tmp = elem (j * x_stride + x_offset);
 
-	  if (octave_is_NaN_or_NA (tmp))
+	  if (xisnan (tmp))
 	    continue;
 	  else if (tmp < tmp_min)
 	    {
@@ -787,7 +787,7 @@
 	}
 
       result.elem (i) = tmp_min;
-      idx_arg.elem (i) = octave_is_NaN_or_NA (tmp_min) ? 0 : idx_j;
+      idx_arg.elem (i) = xisnan (tmp_min) ? 0 : idx_j;
     }
 
   return result;