Mercurial > hg > octave-lyh
diff 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 |
line wrap: on
line diff
--- a/liboctave/CNDArray.cc +++ b/liboctave/CNDArray.cc @@ -714,7 +714,7 @@ } ComplexNDArray -ComplexNDArray::max (ArrayN<octave_idx_type>& idx_arg, int dim) const +ComplexNDArray::max (Array<octave_idx_type>& idx_arg, int dim) const { return do_mx_minmax_op<ComplexNDArray> (*this, idx_arg, dim, mx_inline_max); } @@ -726,7 +726,7 @@ } ComplexNDArray -ComplexNDArray::min (ArrayN<octave_idx_type>& idx_arg, int dim) const +ComplexNDArray::min (Array<octave_idx_type>& idx_arg, int dim) const { return do_mx_minmax_op<ComplexNDArray> (*this, idx_arg, dim, mx_inline_min); } @@ -738,7 +738,7 @@ } ComplexNDArray -ComplexNDArray::cummax (ArrayN<octave_idx_type>& idx_arg, int dim) const +ComplexNDArray::cummax (Array<octave_idx_type>& idx_arg, int dim) const { return do_mx_cumminmax_op<ComplexNDArray> (*this, idx_arg, dim, mx_inline_cummax); } @@ -750,7 +750,7 @@ } ComplexNDArray -ComplexNDArray::cummin (ArrayN<octave_idx_type>& idx_arg, int dim) const +ComplexNDArray::cummin (Array<octave_idx_type>& idx_arg, int dim) const { return do_mx_cumminmax_op<ComplexNDArray> (*this, idx_arg, dim, mx_inline_cummin); } @@ -765,19 +765,19 @@ boolNDArray ComplexNDArray::isnan (void) const { - return ArrayN<bool> (fastmap<bool> (xisnan)); + return Array<bool> (fastmap<bool> (xisnan)); } boolNDArray ComplexNDArray::isinf (void) const { - return ArrayN<bool> (fastmap<bool> (xisinf)); + return Array<bool> (fastmap<bool> (xisinf)); } boolNDArray ComplexNDArray::isfinite (void) const { - return ArrayN<bool> (fastmap<bool> (xfinite)); + return Array<bool> (fastmap<bool> (xfinite)); } ComplexNDArray