Mercurial > hg > octave-nkf

diff liboctave/CNDArray.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/CNDArray.cc
+++ b/liboctave/CNDArray.cc
@@ -594,9 +594,9 @@
       double r_val = std::real (val);
       double i_val = std::imag (val);
 
-      if ((! (octave_is_NaN_or_NA (r_val) || xisinf (r_val))
+      if ((! (xisnan (r_val) || xisinf (r_val))
 	   && fabs (r_val) > FLT_MAX)
-	  || (! (octave_is_NaN_or_NA (i_val) || xisinf (i_val))
+	  || (! (xisnan (i_val) || xisinf (i_val))
 	      && fabs (i_val) > FLT_MAX))
 	return true;
     }
@@ -735,7 +735,7 @@
 	{
 	  tmp_max = elem (idx_j * x_stride + x_offset);
 	  
-	  if (! octave_is_NaN_or_NA (tmp_max))
+	  if (! xisnan (tmp_max))
 	    {
 	      abs_max = std::abs(tmp_max);
 	      break;
@@ -746,7 +746,7 @@
 	{
 	  Complex tmp = elem (j * x_stride + x_offset);
 
-	  if (octave_is_NaN_or_NA (tmp))
+	  if (xisnan (tmp))
 	    continue;
 
 	  double abs_tmp = std::abs (tmp);
@@ -759,7 +759,7 @@
 	    }
 	}
 
-      if (octave_is_NaN_or_NA (tmp_max))
+      if (xisnan (tmp_max))
 	{
 	  result.elem (i) = Complex_NaN_result;
 	  idx_arg.elem (i) = 0;
@@ -827,7 +827,7 @@
 	{
 	  tmp_min = elem (idx_j * x_stride + x_offset);
 	  
-	  if (! octave_is_NaN_or_NA (tmp_min))
+	  if (! xisnan (tmp_min))
 	    {
 	      abs_min = std::abs(tmp_min);
 	      break;
@@ -838,7 +838,7 @@
 	{
 	  Complex tmp = elem (j * x_stride + x_offset);
 
-	  if (octave_is_NaN_or_NA (tmp))
+	  if (xisnan (tmp))
 	    continue;
 
 	  double abs_tmp = std::abs (tmp);
@@ -851,7 +851,7 @@
 	    }
 	}
 
-      if (octave_is_NaN_or_NA (tmp_min))
+      if (xisnan (tmp_min))
 	{
 	  result.elem (i) = Complex_NaN_result;
 	  idx_arg.elem (i) = 0;