Mercurial > hg > octave-lyh

comparison liboctave/dNDArray.cc @ 9732:b4fdfee405b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
742 { 742 {
743 return do_mx_minmax_op<NDArray> (*this, dim, mx_inline_max); 743 return do_mx_minmax_op<NDArray> (*this, dim, mx_inline_max);
744 } 744 }
745 745
746 NDArray 746 NDArray
747 NDArray::max (ArrayN<octave_idx_type>& idx_arg, int dim) const 747 NDArray::max (Array<octave_idx_type>& idx_arg, int dim) const
748 { 748 {
749 return do_mx_minmax_op<NDArray> (*this, idx_arg, dim, mx_inline_max); 749 return do_mx_minmax_op<NDArray> (*this, idx_arg, dim, mx_inline_max);
750 } 750 }
751 751
752 NDArray 752 NDArray
754 { 754 {
755 return do_mx_minmax_op<NDArray> (*this, dim, mx_inline_min); 755 return do_mx_minmax_op<NDArray> (*this, dim, mx_inline_min);
756 } 756 }
757 757
758 NDArray 758 NDArray
759 NDArray::min (ArrayN<octave_idx_type>& idx_arg, int dim) const 759 NDArray::min (Array<octave_idx_type>& idx_arg, int dim) const
760 { 760 {
761 return do_mx_minmax_op<NDArray> (*this, idx_arg, dim, mx_inline_min); 761 return do_mx_minmax_op<NDArray> (*this, idx_arg, dim, mx_inline_min);
762 } 762 }
763 763
764 NDArray 764 NDArray
766 { 766 {
767 return do_mx_cumminmax_op<NDArray> (*this, dim, mx_inline_cummax); 767 return do_mx_cumminmax_op<NDArray> (*this, dim, mx_inline_cummax);
768 } 768 }
769 769
770 NDArray 770 NDArray
771 NDArray::cummax (ArrayN<octave_idx_type>& idx_arg, int dim) const 771 NDArray::cummax (Array<octave_idx_type>& idx_arg, int dim) const
772 { 772 {
773 return do_mx_cumminmax_op<NDArray> (*this, idx_arg, dim, mx_inline_cummax); 773 return do_mx_cumminmax_op<NDArray> (*this, idx_arg, dim, mx_inline_cummax);
774 } 774 }
775 775
776 NDArray 776 NDArray
778 { 778 {
779 return do_mx_cumminmax_op<NDArray> (*this, dim, mx_inline_cummin); 779 return do_mx_cumminmax_op<NDArray> (*this, dim, mx_inline_cummin);
780 } 780 }
781 781
782 NDArray 782 NDArray
783 NDArray::cummin (ArrayN<octave_idx_type>& idx_arg, int dim) const 783 NDArray::cummin (Array<octave_idx_type>& idx_arg, int dim) const
784 { 784 {
785 return do_mx_cumminmax_op<NDArray> (*this, idx_arg, dim, mx_inline_cummin); 785 return do_mx_cumminmax_op<NDArray> (*this, idx_arg, dim, mx_inline_cummin);
786 } 786 }
787 787
788 NDArray 788 NDArray
880 } 880 }
881 881
882 boolNDArray 882 boolNDArray
883 NDArray::isnan (void) const 883 NDArray::isnan (void) const
884 { 884 {
885 return ArrayN<bool> (fastmap<bool> (xisnan)); 885 return Array<bool> (fastmap<bool> (xisnan));
886 } 886 }
887 887
888 boolNDArray 888 boolNDArray
889 NDArray::isinf (void) const 889 NDArray::isinf (void) const
890 { 890 {
891 return ArrayN<bool> (fastmap<bool> (xisinf)); 891 return Array<bool> (fastmap<bool> (xisinf));
892 } 892 }
893 893
894 boolNDArray 894 boolNDArray
895 NDArray::isfinite (void) const 895 NDArray::isfinite (void) const
896 { 896 {
897 return ArrayN<bool> (fastmap<bool> (xfinite)); 897 return Array<bool> (fastmap<bool> (xfinite));
898 } 898 }
899 899
900 Matrix 900 Matrix
901 NDArray::matrix_value (void) const 901 NDArray::matrix_value (void) const
902 { 902 {