Mercurial > hg > octave-lyh

diff liboctave/dMatrix.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/dMatrix.cc
+++ b/liboctave/dMatrix.cc
@@ -2114,7 +2114,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;
     }
@@ -2270,7 +2270,7 @@
 	    {
 	      tmp_min = elem (i, idx_j);
 
-	      if (! octave_is_NaN_or_NA (tmp_min))
+	      if (! xisnan (tmp_min))
 		break;
 	    }
 
@@ -2278,7 +2278,7 @@
 	    {
 	      double tmp = elem (i, j);
 
-	      if (octave_is_NaN_or_NA (tmp))
+	      if (xisnan (tmp))
 		continue;
 	      else if (tmp < tmp_min)
 		{
@@ -2288,7 +2288,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;
         }
     }
 
@@ -2325,7 +2325,7 @@
 	    {
 	      tmp_max = elem (i, idx_j);
 
-	      if (! octave_is_NaN_or_NA (tmp_max))
+	      if (! xisnan (tmp_max))
 		break;
 	    }
 
@@ -2333,7 +2333,7 @@
 	    {
 	      double tmp = elem (i, j);
 
-	      if (octave_is_NaN_or_NA (tmp))
+	      if (xisnan (tmp))
 		continue;
 	      else if (tmp > tmp_max)
 		{
@@ -2343,7 +2343,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;
         }
     }
 
@@ -2380,7 +2380,7 @@
 	    {
 	      tmp_min = elem (idx_i, j);
 
-	      if (! octave_is_NaN_or_NA (tmp_min))
+	      if (! xisnan (tmp_min))
 		break;
 	    }
 
@@ -2388,7 +2388,7 @@
 	    {
 	      double tmp = elem (i, j);
 
-	      if (octave_is_NaN_or_NA (tmp))
+	      if (xisnan (tmp))
 		continue;
 	      else if (tmp < tmp_min)
 		{
@@ -2398,7 +2398,7 @@
 	    }
 
 	  result.elem (j) = tmp_min;
-	  idx_arg.elem (j) = octave_is_NaN_or_NA (tmp_min) ? 0 : idx_i;
+	  idx_arg.elem (j) = xisnan (tmp_min) ? 0 : idx_i;
         }
     }
 
@@ -2435,7 +2435,7 @@
 	    {
 	      tmp_max = elem (idx_i, j);
 
-	      if (! octave_is_NaN_or_NA (tmp_max))
+	      if (! xisnan (tmp_max))
 		break;
 	    }
 
@@ -2443,7 +2443,7 @@
 	    {
 	      double tmp = elem (i, j);
 
-	      if (octave_is_NaN_or_NA (tmp))
+	      if (xisnan (tmp))
 		continue;
 	      else if (tmp > tmp_max)
 		{
@@ -2453,7 +2453,7 @@
 	    }
 
 	  result.elem (j) = tmp_max;
-	  idx_arg.elem (j) = octave_is_NaN_or_NA (tmp_max) ? 0 : idx_i;
+	  idx_arg.elem (j) = xisnan (tmp_max) ? 0 : idx_i;
         }
     }