Mercurial > octave-nkf

comparison liboctave/CNDArray.cc @ 5073:e71be9c548f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2004-11-09 18:31:25 by jwe]
author jwe
date Tue, 09 Nov 2004 18:31:26 +0000
parents 954cc2ba6a49
children e35b034d3523
comparison
equal deleted inserted replaced
5072:97b62f0c1bee 5073:e71be9c548f2
652 { 652 {
653 MX_ND_COMPLEX_OP_REDUCTION (+= elem (iter_idx), Complex (0, 0)); 653 MX_ND_COMPLEX_OP_REDUCTION (+= elem (iter_idx), Complex (0, 0));
654 } 654 }
655 655
656 ComplexNDArray 656 ComplexNDArray
657 concat (const ComplexNDArray& ra, const ComplexNDArray& rb, 657 ComplexNDArray::concat (const ComplexNDArray& rb, const Array<int>& ra_idx)
658 const Array<int>& ra_idx) 658 {
659 {
660 ComplexNDArray retval (ra);
661 if (rb.numel () > 0) 659 if (rb.numel () > 0)
662 retval.insert (rb, ra_idx); 660 insert (rb, ra_idx);
663 return retval; 661 return *this;
664 } 662 }
665 663
666 ComplexNDArray 664 ComplexNDArray
667 concat (const ComplexNDArray& ra, const NDArray& rb, const Array<int>& ra_idx) 665 ComplexNDArray::concat (const NDArray& rb, const Array<int>& ra_idx)
668 { 666 {
669 ComplexNDArray retval (ra);
670 ComplexNDArray tmp (rb); 667 ComplexNDArray tmp (rb);
671 if (rb.numel () > 0) 668 if (rb.numel () > 0)
672 retval.insert (tmp, ra_idx); 669 insert (tmp, ra_idx);
673 return retval; 670 return *this;
674 } 671 }
675 672
676 ComplexNDArray 673 ComplexNDArray
677 concat (const NDArray& ra, const ComplexNDArray& rb, const Array<int>& ra_idx) 674 concat (NDArray& ra, ComplexNDArray& rb, const Array<int>& ra_idx)
678 { 675 {
679 ComplexNDArray retval (ra); 676 ComplexNDArray retval (ra);
680 if (rb.numel () > 0) 677 if (rb.numel () > 0)
681 retval.insert (rb, ra_idx); 678 retval.insert (rb, ra_idx);
682 return retval; 679 return retval;