Mercurial > hg > octave-terminal
changeset 11352:5ea2644b0111
fix cut and paste error in Matrix by ComplexMatrix multiplication operator
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 13 Dec 2010 21:09:09 -0500 |
parents | bff585d759cf |
children | cbf58e4b5f4e |
files | liboctave/CMatrix.cc liboctave/ChangeLog |
diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/CMatrix.cc +++ b/liboctave/CMatrix.cc @@ -3668,7 +3668,7 @@ if (a.rows () > std::min (m.rows (), a.columns ()) / 10) return ComplexMatrix (m * real (a), m * imag (a)); else - return m * ComplexMatrix (a); + return ComplexMatrix (m) * a; } /* Simple Dot Product, Matrix-Vector and Matrix-Matrix Unit tests
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,8 @@ +2010-12-13 John W. Eaton <jwe@octave.org> + + * CMatrix.cc (operator * (const Matrix& m, const ComplexMatrix& a)): + Fix cut and paste error. + 2010-12-09 Marco Atzeri <marco_atzeri@yahoo.it> * lo-specfun.cc (xgamma): Also handle negative integer values as