Mercurial > octave-nkf

comparison liboctave/array/fCMatrix.cc @ 18114:0fa235a252a5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix cut and paste error in Matrix by ComplexMatrix multiplication operator * fCMatrix.cc (operator * (const FloatMatrix&, const FloatComplexMatrix&)): Fix cut and paste error.
author John W. Eaton <jwe@octave.org>
date Fri, 06 Dec 2013 16:39:56 -0500
parents 49a5a4be04a1
children 4a4897cd6da1 ff4da3c8ed16
comparison
equal deleted inserted replaced
18097:a6cfe292bfb6 18114:0fa235a252a5
3753 operator * (const FloatMatrix& m, const FloatComplexMatrix& a) 3753 operator * (const FloatMatrix& m, const FloatComplexMatrix& a)
3754 { 3754 {
3755 if (a.rows () > std::min (m.rows (), a.columns ()) / 10) 3755 if (a.rows () > std::min (m.rows (), a.columns ()) / 10)
3756 return FloatComplexMatrix (m * real (a), m * imag (a)); 3756 return FloatComplexMatrix (m * real (a), m * imag (a));
3757 else 3757 else
3758 return m * FloatComplexMatrix (a); 3758 return FloatComplexMatrix (m) * a;
3759 } 3759 }
3760 3760
3761 /* 3761 /*
3762 3762
3763 ## Simple Dot Product, Matrix-Vector, and Matrix-Matrix Unit tests 3763 ## Simple Dot Product, Matrix-Vector, and Matrix-Matrix Unit tests