Mercurial > hg > octave-lyh
changeset 9526:f3ebc728ffd7
fix typos in complex xgemm
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Sun, 16 Aug 2009 06:55:15 +0200 |
| parents | 691545147aca |
| children | 6a9fd5f653c9 |
| files | liboctave/CMatrix.cc liboctave/ChangeLog liboctave/fCMatrix.cc |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/CMatrix.cc +++ b/liboctave/CMatrix.cc @@ -3746,6 +3746,7 @@ %!assert([1+i 2+i 3+i] * [ 4+i ; 5+i ; 6+i], 29+21i, 1e-14) %!assert([1+i 2+i ; 3+i 4+i ] * [5+i ; 6+i], [15 + 14i ; 37 + 18i], 1e-14) %!assert([1+i 2+i ; 3+i 4+i ] * [5+i 6+i ; 7+i 8+i], [17 + 15i 20 + 17i; 41 + 19i 48 + 21i], 1e-14) +%!assert([1 i]*[i 0]', -i); */ /* Test some simple identities @@ -3839,7 +3840,7 @@ F77_FUNC (xzdotu, XZDOTU) (a_nc, a.data (), 1, b.data (), 1, *c); if (conja) *c = std::conj (*c); } - else if (conjb) + else if (conja) F77_FUNC (xzdotc, XZDOTC) (a_nc, a.data (), 1, b.data (), 1, *c); else F77_FUNC (xzdotc, XZDOTC) (a_nc, b.data (), 1, a.data (), 1, *c);
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,8 @@ +2009-08-16 Jaroslav Hajek <highegg@gmail.com> + + * CMatrix.cc (xgemm): Fix typo. Add test. + * fCMatrix.cc (xgemm): Ditto. + 2009-08-14 John W. Eaton <jwe@octave.org> * Makefile.in (LINK_DEPS): Include BLAS_LIBS in the list.
--- a/liboctave/fCMatrix.cc +++ b/liboctave/fCMatrix.cc @@ -3739,6 +3739,7 @@ %!assert([1+i 2+i 3+i] * [ 4+i ; 5+i ; 6+i], 29+21i, 1e-14) %!assert([1+i 2+i ; 3+i 4+i ] * [5+i ; 6+i], [15 + 14i ; 37 + 18i], 1e-14) %!assert([1+i 2+i ; 3+i 4+i ] * [5+i 6+i ; 7+i 8+i], [17 + 15i 20 + 17i; 41 + 19i 48 + 21i], 1e-14) +%!assert([1 i]*[i 0]', -i); */ /* Test some simple identities @@ -3832,7 +3833,7 @@ F77_FUNC (xcdotu, XCDOTU) (a_nc, a.data (), 1, b.data (), 1, *c); if (conja) *c = std::conj (*c); } - else if (conjb) + else if (conja) F77_FUNC (xcdotc, XCDOTC) (a_nc, a.data (), 1, b.data (), 1, *c); else F77_FUNC (xcdotc, XCDOTC) (a_nc, b.data (), 1, a.data (), 1, *c);