Mercurial > hg > octave-nkf

diff liboctave/dSparse.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 a103c41e68b2
children b91241999ba6
line wrap: on
line diff
--- a/liboctave/dSparse.cc
+++ b/liboctave/dSparse.cc
@@ -226,9 +226,9 @@
 	    {
 	      double tmp = data (i);
 
-	      if (octave_is_NaN_or_NA (tmp))
+	      if (xisnan (tmp))
 		continue;
-	      else if (octave_is_NaN_or_NA (tmp_max) || tmp > tmp_max)
+	      else if (xisnan (tmp_max) || tmp > tmp_max)
 		{
 		  idx_j = ridx (i);
 		  tmp_max = tmp;
@@ -236,7 +236,7 @@
 
 	    }
 
- 	  idx_arg.elem (j) = octave_is_NaN_or_NA (tmp_max) ? 0 : idx_j;
+ 	  idx_arg.elem (j) = xisnan (tmp_max) ? 0 : idx_j;
 	  if (tmp_max != 0.)
 	    nel++;
 	}
@@ -290,7 +290,7 @@
 	      octave_idx_type ix = idx_arg.elem (ir);
 	      double tmp = data (i);
 
-	      if (octave_is_NaN_or_NA (tmp))
+	      if (xisnan (tmp))
 		continue;
 	      else if (ix == -1 || tmp > elem (ir, ix))
 		idx_arg.elem (ir) = j;
@@ -372,9 +372,9 @@
 	    {
 	      double tmp = data (i);
 
-	      if (octave_is_NaN_or_NA (tmp))
+	      if (xisnan (tmp))
 		continue;
-	      else if (octave_is_NaN_or_NA (tmp_min) || tmp < tmp_min)
+	      else if (xisnan (tmp_min) || tmp < tmp_min)
 		{
 		  idx_j = ridx (i);
 		  tmp_min = tmp;
@@ -382,7 +382,7 @@
 
 	    }
 
- 	  idx_arg.elem (j) = octave_is_NaN_or_NA (tmp_min) ? 0 : idx_j;
+ 	  idx_arg.elem (j) = xisnan (tmp_min) ? 0 : idx_j;
 	  if (tmp_min != 0.)
 	    nel++;
 	}
@@ -436,7 +436,7 @@
 	      octave_idx_type ix = idx_arg.elem (ir);
 	      double tmp = data (i);
 
-	      if (octave_is_NaN_or_NA (tmp))
+	      if (xisnan (tmp))
 		continue;
 	      else if (ix == -1 || tmp < elem (ir, ix))
 		idx_arg.elem (ir) = j;