comparison liboctave/CNDArray.cc @ 9732:b4fdfee405b5

remove ArrayN<T> + fix nonhom. diag-scalar ops
author Jaroslav Hajek <highegg@gmail.com>
date Fri, 16 Oct 2009 13:12:31 +0200
parents 192d94cff6c1
children 26abff55f6fe
comparison
equal deleted inserted replaced
9731:7b9cbaad68d6 9732:b4fdfee405b5
712 { 712 {
713 return do_mx_minmax_op<ComplexNDArray> (*this, dim, mx_inline_max); 713 return do_mx_minmax_op<ComplexNDArray> (*this, dim, mx_inline_max);
714 } 714 }
715 715
716 ComplexNDArray 716 ComplexNDArray
717 ComplexNDArray::max (ArrayN<octave_idx_type>& idx_arg, int dim) const 717 ComplexNDArray::max (Array<octave_idx_type>& idx_arg, int dim) const
718 { 718 {
719 return do_mx_minmax_op<ComplexNDArray> (*this, idx_arg, dim, mx_inline_max); 719 return do_mx_minmax_op<ComplexNDArray> (*this, idx_arg, dim, mx_inline_max);
720 } 720 }
721 721
722 ComplexNDArray 722 ComplexNDArray
724 { 724 {
725 return do_mx_minmax_op<ComplexNDArray> (*this, dim, mx_inline_min); 725 return do_mx_minmax_op<ComplexNDArray> (*this, dim, mx_inline_min);
726 } 726 }
727 727
728 ComplexNDArray 728 ComplexNDArray
729 ComplexNDArray::min (ArrayN<octave_idx_type>& idx_arg, int dim) const 729 ComplexNDArray::min (Array<octave_idx_type>& idx_arg, int dim) const
730 { 730 {
731 return do_mx_minmax_op<ComplexNDArray> (*this, idx_arg, dim, mx_inline_min); 731 return do_mx_minmax_op<ComplexNDArray> (*this, idx_arg, dim, mx_inline_min);
732 } 732 }
733 733
734 ComplexNDArray 734 ComplexNDArray
736 { 736 {
737 return do_mx_cumminmax_op<ComplexNDArray> (*this, dim, mx_inline_cummax); 737 return do_mx_cumminmax_op<ComplexNDArray> (*this, dim, mx_inline_cummax);
738 } 738 }
739 739
740 ComplexNDArray 740 ComplexNDArray
741 ComplexNDArray::cummax (ArrayN<octave_idx_type>& idx_arg, int dim) const 741 ComplexNDArray::cummax (Array<octave_idx_type>& idx_arg, int dim) const
742 { 742 {
743 return do_mx_cumminmax_op<ComplexNDArray> (*this, idx_arg, dim, mx_inline_cummax); 743 return do_mx_cumminmax_op<ComplexNDArray> (*this, idx_arg, dim, mx_inline_cummax);
744 } 744 }
745 745
746 ComplexNDArray 746 ComplexNDArray
748 { 748 {
749 return do_mx_cumminmax_op<ComplexNDArray> (*this, dim, mx_inline_cummin); 749 return do_mx_cumminmax_op<ComplexNDArray> (*this, dim, mx_inline_cummin);
750 } 750 }
751 751
752 ComplexNDArray 752 ComplexNDArray
753 ComplexNDArray::cummin (ArrayN<octave_idx_type>& idx_arg, int dim) const 753 ComplexNDArray::cummin (Array<octave_idx_type>& idx_arg, int dim) const
754 { 754 {
755 return do_mx_cumminmax_op<ComplexNDArray> (*this, idx_arg, dim, mx_inline_cummin); 755 return do_mx_cumminmax_op<ComplexNDArray> (*this, idx_arg, dim, mx_inline_cummin);
756 } 756 }
757 757
758 NDArray 758 NDArray
763 } 763 }
764 764
765 boolNDArray 765 boolNDArray
766 ComplexNDArray::isnan (void) const 766 ComplexNDArray::isnan (void) const
767 { 767 {
768 return ArrayN<bool> (fastmap<bool> (xisnan)); 768 return Array<bool> (fastmap<bool> (xisnan));
769 } 769 }
770 770
771 boolNDArray 771 boolNDArray
772 ComplexNDArray::isinf (void) const 772 ComplexNDArray::isinf (void) const
773 { 773 {
774 return ArrayN<bool> (fastmap<bool> (xisinf)); 774 return Array<bool> (fastmap<bool> (xisinf));
775 } 775 }
776 776
777 boolNDArray 777 boolNDArray
778 ComplexNDArray::isfinite (void) const 778 ComplexNDArray::isfinite (void) const
779 { 779 {
780 return ArrayN<bool> (fastmap<bool> (xfinite)); 780 return Array<bool> (fastmap<bool> (xfinite));
781 } 781 }
782 782
783 ComplexNDArray 783 ComplexNDArray
784 conj (const ComplexNDArray& a) 784 conj (const ComplexNDArray& a)
785 { 785 {