# HG changeset patch # User Jaroslav Hajek # Date 1251018635 -7200 # Node ID 4c7b51b2541de738f641b7629ca031dcec3abb29 # Parent 26fb50dc74013257d0f7f1572b57311921bfbf24 fix typos in complex xgemm diff -r 26fb50dc7401 -r 4c7b51b2541d liboctave/CMatrix.cc --- a/liboctave/CMatrix.cc Sun Aug 23 11:10:05 2009 +0200 +++ b/liboctave/CMatrix.cc Sun Aug 23 11:10:35 2009 +0200 @@ -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); diff -r 26fb50dc7401 -r 4c7b51b2541d liboctave/ChangeLog --- a/liboctave/ChangeLog Sun Aug 23 11:10:05 2009 +0200 +++ b/liboctave/ChangeLog Sun Aug 23 11:10:35 2009 +0200 @@ -1,3 +1,8 @@ +2009-08-16 Jaroslav Hajek + + * CMatrix.cc (xgemm): Fix typo. Add test. + * fCMatrix.cc (xgemm): Ditto. + 2009-07-20 John W. Eaton * lo-ieee.cc (octave_ieee_init) [__NetBSD__]: Call nan to diff -r 26fb50dc7401 -r 4c7b51b2541d liboctave/fCMatrix.cc --- a/liboctave/fCMatrix.cc Sun Aug 23 11:10:05 2009 +0200 +++ b/liboctave/fCMatrix.cc Sun Aug 23 11:10:35 2009 +0200 @@ -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);