Mercurial > hg > octave-nkf
diff liboctave/dMatrix.h @ 2828:92826d6e8bd9
[project @ 1997-03-25 23:41:41 by jwe]
author | jwe |
---|---|
date | Tue, 25 Mar 1997 23:50:08 +0000 |
parents | a5a300c61159 |
children | 4dff308e9acc |
line wrap: on
line diff
--- a/liboctave/dMatrix.h +++ b/liboctave/dMatrix.h @@ -60,6 +60,7 @@ // Matrix (const MDiagArray2<double>& a) : MArray2<double> (a) { } Matrix (const DiagMatrix& a); + Matrix (const boolMatrix& a); Matrix (const charMatrix& a); Matrix& operator = (const Matrix& a) @@ -175,32 +176,6 @@ friend Matrix operator * (const ColumnVector& a, const RowVector& b); - // diagonal matrix by scalar -> matrix operations - - friend Matrix operator + (const DiagMatrix& a, double s); - friend Matrix operator - (const DiagMatrix& a, double s); - - // scalar by diagonal matrix -> matrix operations - - friend Matrix operator + (double s, const DiagMatrix& a); - friend Matrix operator - (double s, const DiagMatrix& a); - - // matrix by diagonal matrix -> matrix operations - - friend Matrix operator + (const Matrix& a, const DiagMatrix& b); - friend Matrix operator - (const Matrix& a, const DiagMatrix& b); - friend Matrix operator * (const Matrix& a, const DiagMatrix& b); - - // diagonal matrix by matrix -> matrix operations - - friend Matrix operator + (const DiagMatrix& a, const Matrix& b); - friend Matrix operator - (const DiagMatrix& a, const Matrix& b); - friend Matrix operator * (const DiagMatrix& a, const Matrix& b); - - // matrix by matrix -> matrix operations - - friend Matrix operator * (const Matrix& a, const Matrix& b); - // other operations Matrix map (d_d_Mapper f) const; @@ -260,6 +235,8 @@ extern ComplexColumnVector Qzval (const Matrix& a, const Matrix& b); +extern Matrix operator * (const Matrix& a, const Matrix& b); + #endif /*