# HG changeset patch
# User jwe
# Date 752187987 0
# Node ID 6259f4ed7285f3cff28f4da1260c55f38a488f64
# Parent  b6b4d8c513fec54fdcba4610626b31e4ec25c20b
[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.

diff -r b6b4d8c513fe -r 6259f4ed7285 liboctave/DiagMatrix.cc
--- a/liboctave/DiagMatrix.cc	Fri Oct 29 23:41:39 1993 +0000
+++ b/liboctave/DiagMatrix.cc	Mon Nov 01 21:06:27 1993 +0000
@@ -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";
     }