Mercurial > hg > octave-lyh
diff liboctave/CMatrix.h @ 5508:7865515fc6c2
[project @ 2005-10-26 15:24:07 by jwe]
| author | jwe |
|---|---|
| date | Wed, 26 Oct 2005 15:24:08 +0000 |
| parents | 4c8a2e4e0717 |
| children | 34cda7d94c08 |
line wrap: on
line diff
--- a/liboctave/CMatrix.h +++ b/liboctave/CMatrix.h @@ -200,17 +200,6 @@ ComplexMatrix expm (void) const; - // column vector by row vector -> matrix operations - - friend ComplexMatrix operator * (const ColumnVector& a, - const ComplexRowVector& b); - - friend ComplexMatrix operator * (const ComplexColumnVector& a, - const RowVector& b); - - friend ComplexMatrix operator * (const ComplexColumnVector& a, - const ComplexRowVector& b); - // matrix by diagonal matrix -> matrix operations ComplexMatrix& operator += (const DiagMatrix& a); @@ -281,10 +270,22 @@ ComplexMatrix (Complex *d, octave_idx_type r, octave_idx_type c) : MArray2<Complex> (d, r, c) { } }; -ComplexMatrix Givens (const Complex&, const Complex&); +// column vector by row vector -> matrix operations + +extern ComplexMatrix +operator * (const ColumnVector& a, const ComplexRowVector& b); + +extern ComplexMatrix +operator * (const ComplexColumnVector& a, const RowVector& b); -ComplexMatrix Sylvester (const ComplexMatrix&, const ComplexMatrix&, - const ComplexMatrix&); +extern ComplexMatrix +operator * (const ComplexColumnVector& a, const ComplexRowVector& b); + +extern ComplexMatrix +Givens (const Complex&, const Complex&); + +extern ComplexMatrix +Sylvester (const ComplexMatrix&, const ComplexMatrix&, const ComplexMatrix&); extern ComplexMatrix operator * (const Matrix&, const ComplexMatrix&); extern ComplexMatrix operator * (const ComplexMatrix&, const Matrix&);