Mercurial > hg > octave-nkf

changeset 192:6259f4ed7285

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1993-11-01 21:06:27 by jwe] (DiagMatrix::row): Make it work for nr == nc case. (DiagMatrix::column): Likewise. (ComplexDiagMatrix::row): Likewise. (ComplexDiagMatrix::column): Likewise. (DiagMatrix::operator <<): Print spaces between elements. (ComplexDiagMatrix::operator <<): Likewise.
author jwe
date Mon, 01 Nov 1993 21:06:27 +0000
parents b6b4d8c513fe
children 08a59c5cfa82
files liboctave/DiagMatrix.cc
diffstat 1 files changed, 8 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/DiagMatrix.cc
+++ b/liboctave/DiagMatrix.cc
@@ -334,8 +334,7 @@
     FAIL;
 
   RowVector retval (nc, 0.0);
-  if (nr < nc ||
-      (nr > nc && i < nc))
+  if (nr <= nc || (nr > nc && i < nc))
     retval.data [i] = data[i];
 
   return retval;
@@ -363,8 +362,7 @@
     FAIL;
 
   ColumnVector retval (nr, 0.0);
-  if (nr > nc ||
-      (nr < nc && i < nr))
+  if (nr >= nc || (nr < nc && i < nr))
     retval.data [i] = data[i];
 
   return retval;
@@ -902,9 +900,9 @@
       for (int j = 0; j < a.nc; j++)
 	{
 	  if (i == j)
-	    os << /* setw (field_width) << */ a.data[i];
+	    os << " " /* setw (field_width) */ << a.data[i];
 	  else
-	    os << /* setw (field_width) << */ ZERO;
+	    os << " " /* setw (field_width) */ << ZERO;
 	}
       os << "\n";
     }
@@ -1440,8 +1438,7 @@
     FAIL;
 
   ComplexRowVector retval (nc, 0.0);
-  if (nr < nc ||
-      (nr > nc && i < nc))
+  if (nr <= nc || (nr > nc && i < nc))
     retval.data [i] = data[i];
 
   return retval;
@@ -1469,8 +1466,7 @@
     FAIL;
 
   ComplexColumnVector retval (nr, 0.0);
-  if (nr > nc ||
-      (nr < nc && i < nr))
+  if (nr >= nc || (nr < nc && i < nr))
     retval.data [i] = data[i];
 
   return retval;
@@ -2057,9 +2053,9 @@
       for (int j = 0; j < a.nc; j++)
 	{
 	  if (i == j)
-	    os << /* setw (field_width) << */ a.data[i];
+	    os << " " /* setw (field_width) */ << a.data[i];
 	  else
-	    os << /* setw (field_width) << */ ZERO;
+	    os << " " /* setw (field_width) */ << ZERO;
 	}
       os << "\n";
     }