Mercurial > octave-nkf

diff src/pr-output.cc @ 4025:cfb762dc9259

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2002-08-09 06:32:15 by jwe]
author jwe
date Fri, 09 Aug 2002 06:32:16 +0000
parents f1500121e2e9
children b79da8779a0e
line wrap: on
line diff
--- a/src/pr-output.cc	Wed Aug 07 07:11:44 2002 +0000
+++ b/src/pr-output.cc	Fri Aug 09 06:32:16 2002 +0000
@@ -215,7 +215,7 @@
     for (int i = 0; i < nr; i++)
       {
 	double val = m(i,j);
-	if (xisinf (val) || xisnan (val))
+	if (xisinf (val) || octave_is_NaN_or_NA (val))
 	  continue;
 
 	if (val > result)
@@ -237,7 +237,7 @@
     for (int i = 0; i < nr; i++)
       {
 	double val = m(i,j);
-	if (xisinf (val) || xisnan (val))
+	if (xisinf (val) || octave_is_NaN_or_NA (val))
 	  continue;
 
 	if (val < result)
@@ -1138,6 +1138,13 @@
 	  else
 	    os << s;
 	}
+      else if (octave_is_NA (d))
+	{
+	  if (fw > 0)
+	    os << std::setw (fw) << "NA";
+	  else
+	    os << "NA";
+	}
       else if (xisnan (d))
 	{
 	  if (fw > 0)
@@ -2102,7 +2109,7 @@
 {
   double val;
   if (builtin_real_scalar_variable ("output_max_field_width", val)
-      && ! xisnan (val))
+      && ! octave_is_NaN_or_NA (val))
     {
       int ival = NINT (val);
       if (ival > 0 && ival == val)
@@ -2120,7 +2127,7 @@
 {
   double val;
   if (builtin_real_scalar_variable ("output_precision", val)
-      && ! xisnan (val))
+      && ! octave_is_NaN_or_NA (val))
     {
       int ival = NINT (val);
       if (ival >= 0 && ival == val)