Mercurial > hg > octave-avbm
changeset 343:ecb6f1e11842
[project @ 1994-02-08 03:24:33 by jwe]
author | jwe |
---|---|
date | Tue, 08 Feb 1994 03:24:39 +0000 |
parents | 073585d1d4fa |
children | a7fd0923e4e4 |
files | liboctave/Matrix.cc liboctave/Matrix.h |
diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Matrix.cc +++ b/liboctave/Matrix.cc @@ -364,7 +364,7 @@ Matrix::fill (double val, int r1, int c1, int r2, int c2) { int nr = rows (); - int nc = rows (); + int nc = cols (); if (r1 < 0 || r2 < 0 || c1 < 0 || c2 < 0 || r1 >= nr || r2 >= nr || c1 >= nc || c2 >= nc) { @@ -2622,7 +2622,7 @@ ComplexMatrix::fill (double val, int r1, int c1, int r2, int c2) { int nr = rows (); - int nc = rows (); + int nc = cols (); if (r1 < 0 || r2 < 0 || c1 < 0 || c2 < 0 || r1 >= nr || r2 >= nr || c1 >= nc || c2 >= nc) { @@ -2644,7 +2644,7 @@ ComplexMatrix::fill (const Complex& val, int r1, int c1, int r2, int c2) { int nr = rows (); - int nc = rows (); + int nc = cols (); if (r1 < 0 || r2 < 0 || c1 < 0 || c2 < 0 || r1 >= nr || r2 >= nr || c1 >= nc || c2 >= nc) {
--- a/liboctave/Matrix.h +++ b/liboctave/Matrix.h @@ -474,7 +474,7 @@ // row vector by column vector -> scalar - friend double operator * (const RowVector& a, ColumnVector& b); + friend double operator * (const RowVector& a, const ColumnVector& b); friend Complex operator * (const RowVector& a, const ComplexColumnVector& b); @@ -613,8 +613,8 @@ friend ColumnVector operator * (const DiagMatrix& a, const ColumnVector& b); - friend ComplexColumnVector operator * (const DiagMatrix& a, const - ComplexColumnVector& b); + friend ComplexColumnVector operator * (const DiagMatrix& a, + const ComplexColumnVector& b); // diagonal matrix by diagonal matrix -> diagonal matrix operations