Mercurial > octave

comparison liboctave/CNDArray.cc @ 4940:954cc2ba6a49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2004-08-24 19:30:31 by jwe]
author jwe
date Tue, 24 Aug 2004 19:32:46 +0000
parents c638c144d4da
children e71be9c548f2
comparison
equal deleted inserted replaced
4939:22388c7625a0 4940:954cc2ba6a49
656 ComplexNDArray 656 ComplexNDArray
657 concat (const ComplexNDArray& ra, const ComplexNDArray& rb, 657 concat (const ComplexNDArray& ra, const ComplexNDArray& rb,
658 const Array<int>& ra_idx) 658 const Array<int>& ra_idx)
659 { 659 {
660 ComplexNDArray retval (ra); 660 ComplexNDArray retval (ra);
661 if (ra.numel () > 0) 661 if (rb.numel () > 0)
662 retval.insert (rb, ra_idx); 662 retval.insert (rb, ra_idx);
663 return retval; 663 return retval;
664 } 664 }
665 665
666 ComplexNDArray 666 ComplexNDArray
667 concat (const ComplexNDArray& ra, const NDArray& rb, const Array<int>& ra_idx) 667 concat (const ComplexNDArray& ra, const NDArray& rb, const Array<int>& ra_idx)
668 { 668 {
669 ComplexNDArray retval (ra); 669 ComplexNDArray retval (ra);
670 ComplexNDArray tmp (rb); 670 ComplexNDArray tmp (rb);
671 if (ra.numel () > 0) 671 if (rb.numel () > 0)
672 retval.insert (tmp, ra_idx); 672 retval.insert (tmp, ra_idx);
673 return retval; 673 return retval;
674 } 674 }
675 675
676 ComplexNDArray 676 ComplexNDArray
677 concat (const NDArray& ra, const ComplexNDArray& rb, const Array<int>& ra_idx) 677 concat (const NDArray& ra, const ComplexNDArray& rb, const Array<int>& ra_idx)
678 { 678 {
679 ComplexNDArray retval (ra); 679 ComplexNDArray retval (ra);
680 if (ra.numel () > 0) 680 if (rb.numel () > 0)
681 retval.insert (rb, ra_idx); 681 retval.insert (rb, ra_idx);
682 return retval; 682 return retval;
683 } 683 }
684 684
685 static const Complex Complex_NaN_result (octave_NaN, octave_NaN); 685 static const Complex Complex_NaN_result (octave_NaN, octave_NaN);