Mercurial > octave-nkf
changeset 7796:762801c50b21
Fix tests for transpose in Array.cc
| author | David Bateman <dbateman@free.fr> |
|---|---|
| date | Tue, 13 May 2008 12:40:23 +0200 |
| parents | df9519e9990c |
| children | f42c6f8d6d8e |
| files | liboctave/Array.cc liboctave/ChangeLog |
| diffstat | 2 files changed, 24 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Array.cc Mon May 12 22:57:11 2008 +0200 +++ b/liboctave/Array.cc Tue May 13 12:40:23 2008 +0200 @@ -1330,31 +1330,30 @@ %!shared m7, mt7, m8, mt8, m9, mt9 %! m7 = reshape (1 : 7*8, 8, 7); -%! mt7 = [1:7; 1:7, 1:7, 1:7, 1:7; 1:7, 1:7, 1:7]; +%! mt7 = [1:8; 9:16; 17:24; 25:32; 33:40; 41:48; 49:56]; %! m8 = reshape (1 : 8*8, 8, 8); -%! mt8 = [1:8; 1:8, 1:8, 1:8, 1:8; 1:8, 1:8, 1:8]; +%! mt8 = mt8 = [mt7; 57:64]; %! m9 = reshape (1 : 9*8, 8, 9); -%! mt9 = [1:9; 1:9, 1:9, 1:9, 1:9; 1:9, 1:9, 1:9]; - -%!assert (m7', mt7) -%!assert ((1i*m7).', 1i * mt7) -%!assert ((1i*m7)', conj (1i * mt7)) -%!assert (m8', mt8) -%!assert ((1i*m8).', 1i * mt8) -%!assert ((1i*m8)', conj (1i * mt8)) -%!assert (m9', mt9) -%!assert ((1i*m9).', 1i * mt9) -%!assert ((1i*m9)', conj (1i * mt9)) - -%!assert ([m7, m7; m8, m8]', [mt7, mt8; mt7, mt8]) -%!assert ((1i*[m7, m7; m8, m8]).', 1i * [mt7, mt8; mt7, mt8]) -%!assert ((1i*[m7, m7; m8, m8])', conj (1i * [mt7, mt8; mt7, mt8])) -%!assert ([m8, m8; m8, m8]', [mt8, mt8; mt8, mt8]) -%!assert ((1i*[m8, m8; m8, m8]).', 1i * [mt8, mt8; mt8, mt8]) -%!assert ((1i*[m8, m8; m8, m8])', conj (1i * [mt8, mt8; mt8, mt8])) -%!assert ([m9, m9; m8, m8]', [mt9, mt8; mt9, mt8]) -%!assert ((1i*[m9, m9; m8, m8]).', 1i * [mt9, mt8; mt9, mt8]) -%!assert ((1i*[m9, m9; m8, m8])', conj (1i * [mt9, mt8; mt9, mt8])) +%! mt9 = [mt8; 65:72]; + +%!assert(m7', mt7) +%!assert((1i*m7).', 1i * mt7) +%!assert((1i*m7)', conj (1i * mt7)) +%!assert(m8', mt8) +%!assert((1i*m8).', 1i * mt8) +%!assert((1i*m8)', conj (1i * mt8)) +%!assert(m9', mt9) +%!assert((1i*m9).', 1i * mt9) +%!assert((1i*m9)', conj (1i * mt9)) +%!assert([m7, m8; m7, m8]', [mt7, mt7; mt8, mt8]) +%!assert((1i*[m7, m8; m7, m8]).', 1i * [mt7, mt7; mt8, mt8]) +%!assert((1i*[m7, m8; m7, m8])', conj (1i * [mt7, mt7; mt8, mt8])) +%!assert([m8, m8; m8, m8]', [mt8, mt8; mt8, mt8]) +%!assert((1i*[m8, m8; m8, m8]).', 1i * [mt8, mt8; mt8, mt8]) +%!assert((1i*[m8, m8; m8, m8])', conj (1i * [mt8, mt8; mt8, mt8])) +%!assert([m9, m8; m9, m8]', [mt9, mt9; mt8, mt8]) +%!assert((1i*[m9, m8; m9, m8]).', 1i * [mt9, mt9; mt8, mt8]) +%!assert((1i*[m9, m8; m9, m8])', conj (1i * [mt9, mt9; mt8, mt8])) */
--- a/liboctave/ChangeLog Mon May 12 22:57:11 2008 +0200 +++ b/liboctave/ChangeLog Tue May 13 12:40:23 2008 +0200 @@ -1,5 +1,7 @@ 2008-05-21 David Bateman <dbateman@free.fr> + * Array.cc: Fix transpose tests. + * CmplxGEBAL.cc (ComplexGEPBALANCE), dbleGEPBAL.cc (GEPBALANCE), fCmplxGEPBAL.cc (FloatComplexGEPBALANCE), floatGEPBAL.cc (FloatGEPBALANCE): New class for generalized eigenvalue balancing.