Mercurial > hg > octave-nkf

diff liboctave/CMatrix.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 4b45b2bcda89
line wrap: on
line diff
--- a/liboctave/CMatrix.cc
+++ b/liboctave/CMatrix.cc
@@ -2607,9 +2607,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;
       }
@@ -2806,7 +2806,7 @@
 	    {
 	      tmp_min = elem (i, idx_j);
 
-	      if (! octave_is_NaN_or_NA (tmp_min))
+	      if (! xisnan (tmp_min))
 		{
 		  abs_min = real_only ? std::real (tmp_min) : std::abs (tmp_min);
 		  break;
@@ -2817,7 +2817,7 @@
 	    {
 	      Complex tmp = elem (i, j);
 
-	      if (octave_is_NaN_or_NA (tmp))
+	      if (xisnan (tmp))
 		continue;
 
 	      double abs_tmp = real_only ? std::real (tmp) : std::abs (tmp);
@@ -2830,7 +2830,7 @@
 		}
 	    }
 
-	  if (octave_is_NaN_or_NA (tmp_min))
+	  if (xisnan (tmp_min))
 	    {
 	      result.elem (i) = Complex_NaN_result;
 	      idx_arg.elem (i) = 0;
@@ -2880,7 +2880,7 @@
 	    {
 	      tmp_max = elem (i, idx_j);
 
-	      if (! octave_is_NaN_or_NA (tmp_max))
+	      if (! xisnan (tmp_max))
 		{
 		  abs_max = real_only ? std::real (tmp_max) : std::abs (tmp_max);
 		  break;
@@ -2891,7 +2891,7 @@
 	    {
 	      Complex tmp = elem (i, j);
 
-	      if (octave_is_NaN_or_NA (tmp))
+	      if (xisnan (tmp))
 		continue;
 
 	      double abs_tmp = real_only ? std::real (tmp) : std::abs (tmp);
@@ -2904,7 +2904,7 @@
 		}
 	    }
 
-	  if (octave_is_NaN_or_NA (tmp_max))
+	  if (xisnan (tmp_max))
 	    {
 	      result.elem (i) = Complex_NaN_result;
 	      idx_arg.elem (i) = 0;
@@ -2954,7 +2954,7 @@
 	    {
 	      tmp_min = elem (idx_i, j);
 
-	      if (! octave_is_NaN_or_NA (tmp_min))
+	      if (! xisnan (tmp_min))
 		{
 		  abs_min = real_only ? std::real (tmp_min) : std::abs (tmp_min);
 		  break;
@@ -2965,7 +2965,7 @@
 	    {
 	      Complex tmp = elem (i, j);
 
-	      if (octave_is_NaN_or_NA (tmp))
+	      if (xisnan (tmp))
 		continue;
 
 	      double abs_tmp = real_only ? std::real (tmp) : std::abs (tmp);
@@ -2978,7 +2978,7 @@
 		}
 	    }
 
-	  if (octave_is_NaN_or_NA (tmp_min))
+	  if (xisnan (tmp_min))
 	    {
 	      result.elem (j) = Complex_NaN_result;
 	      idx_arg.elem (j) = 0;
@@ -3028,7 +3028,7 @@
 	    {
 	      tmp_max = elem (idx_i, j);
 
-	      if (! octave_is_NaN_or_NA (tmp_max))
+	      if (! xisnan (tmp_max))
 		{
 		  abs_max = real_only ? std::real (tmp_max) : std::abs (tmp_max);
 		  break;
@@ -3039,7 +3039,7 @@
 	    {
 	      Complex tmp = elem (i, j);
 
-	      if (octave_is_NaN_or_NA (tmp))
+	      if (xisnan (tmp))
 		continue;
 
 	      double abs_tmp = real_only ? std::real (tmp) : std::abs (tmp);
@@ -3052,7 +3052,7 @@
 		}
 	    }
 
-	  if (octave_is_NaN_or_NA (tmp_max))
+	  if (xisnan (tmp_max))
 	    {
 	      result.elem (j) = Complex_NaN_result;
 	      idx_arg.elem (j) = 0;