Mercurial > hg > octave-nkf

diff liboctave/dMatrix.cc @ 2832:4dff308e9acc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1997-03-26 05:16:58 by jwe]
author jwe
date Wed, 26 Mar 1997 05:17:00 +0000
parents 92826d6e8bd9
children 8b262e771614
line wrap: on
line diff
--- a/liboctave/dMatrix.cc
+++ b/liboctave/dMatrix.cc
@@ -1691,23 +1691,23 @@
 // cleaned up a bit, no?  What about corresponding functions for the
 // Vectors?
 
-Matrix
+boolMatrix
 Matrix::all (void) const
 {
   int nr = rows ();
   int nc = cols ();
-  Matrix retval;
+  boolMatrix retval;
   if (nr > 0 && nc > 0)
     {
       if (nr == 1)
 	{
 	  retval.resize (1, 1);
-	  retval.elem (0, 0) = 1.0;
+	  retval.elem (0, 0) = true;
 	  for (int j = 0; j < nc; j++)
 	    {
 	      if (elem (0, j) == 0.0)
 		{
-		  retval.elem (0, 0) = 0.0;
+		  retval.elem (0, 0) = false;
 		  break;
 		}
 	    }
@@ -1715,12 +1715,12 @@
       else if (nc == 1)
 	{
 	  retval.resize (1, 1);
-	  retval.elem (0, 0) = 1.0;
+	  retval.elem (0, 0) = true;
 	  for (int i = 0; i < nr; i++)
 	    {
 	      if (elem (i, 0) == 0.0)
 		{
-		  retval.elem (0, 0) = 0.0;
+		  retval.elem (0, 0) = false;
 		  break;
 		}
 	    }
@@ -1730,12 +1730,12 @@
 	  retval.resize (1, nc);
 	  for (int j = 0; j < nc; j++)
 	    {
-	      retval.elem (0, j) = 1.0;
+	      retval.elem (0, j) = true;
 	      for (int i = 0; i < nr; i++)
 		{
 		  if (elem (i, j) == 0.0)
 		    {
-		      retval.elem (0, j) = 0.0;
+		      retval.elem (0, j) = false;
 		      break;
 		    }
 		}
@@ -1745,23 +1745,23 @@
   return retval;
 }
 
-Matrix
+boolMatrix
 Matrix::any (void) const
 {
   int nr = rows ();
   int nc = cols ();
-  Matrix retval;
+  boolMatrix retval;
   if (nr > 0 && nc > 0)
     {
       if (nr == 1)
 	{
 	  retval.resize (1, 1);
-	  retval.elem (0, 0) = 0.0;
+	  retval.elem (0, 0) = false;
 	  for (int j = 0; j < nc; j++)
 	    {
 	      if (elem (0, j) != 0.0)
 		{
-		  retval.elem (0, 0) = 1.0;
+		  retval.elem (0, 0) = true;
 		  break;
 		}
 	    }
@@ -1769,12 +1769,12 @@
       else if (nc == 1)
 	{
 	  retval.resize (1, 1);
-	  retval.elem (0, 0) = 0.0;
+	  retval.elem (0, 0) = false;
 	  for (int i = 0; i < nr; i++)
 	    {
 	      if (elem (i, 0) != 0.0)
 		{
-		  retval.elem (0, 0) = 1.0;
+		  retval.elem (0, 0) = true;
 		  break;
 		}
 	    }
@@ -1784,12 +1784,12 @@
 	  retval.resize (1, nc);
 	  for (int j = 0; j < nc; j++)
 	    {
-	      retval.elem (0, j) = 0.0;
+	      retval.elem (0, j) = false;
 	      for (int i = 0; i < nr; i++)
 		{
 		  if (elem (i, j) != 0.0)
 		    {
-		      retval.elem (0, j) = 1.0;
+		      retval.elem (0, j) = true;
 		      break;
 		    }
 		}