Mercurial > octave
diff liboctave/fCNDArray.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/fCNDArray.cc Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/fCNDArray.cc Fri Oct 16 13:12:31 2009 +0200 @@ -709,7 +709,7 @@ } FloatComplexNDArray -FloatComplexNDArray::max (ArrayN<octave_idx_type>& idx_arg, int dim) const +FloatComplexNDArray::max (Array<octave_idx_type>& idx_arg, int dim) const { return do_mx_minmax_op<FloatComplexNDArray> (*this, idx_arg, dim, mx_inline_max); } @@ -721,7 +721,7 @@ } FloatComplexNDArray -FloatComplexNDArray::min (ArrayN<octave_idx_type>& idx_arg, int dim) const +FloatComplexNDArray::min (Array<octave_idx_type>& idx_arg, int dim) const { return do_mx_minmax_op<FloatComplexNDArray> (*this, idx_arg, dim, mx_inline_min); } @@ -733,7 +733,7 @@ } FloatComplexNDArray -FloatComplexNDArray::cummax (ArrayN<octave_idx_type>& idx_arg, int dim) const +FloatComplexNDArray::cummax (Array<octave_idx_type>& idx_arg, int dim) const { return do_mx_cumminmax_op<FloatComplexNDArray> (*this, idx_arg, dim, mx_inline_cummax); } @@ -745,7 +745,7 @@ } FloatComplexNDArray -FloatComplexNDArray::cummin (ArrayN<octave_idx_type>& idx_arg, int dim) const +FloatComplexNDArray::cummin (Array<octave_idx_type>& idx_arg, int dim) const { return do_mx_cumminmax_op<FloatComplexNDArray> (*this, idx_arg, dim, mx_inline_cummin); } @@ -760,19 +760,19 @@ boolNDArray FloatComplexNDArray::isnan (void) const { - return ArrayN<bool> (fastmap<bool> (xisnan)); + return Array<bool> (fastmap<bool> (xisnan)); } boolNDArray FloatComplexNDArray::isinf (void) const { - return ArrayN<bool> (fastmap<bool> (xisinf)); + return Array<bool> (fastmap<bool> (xisinf)); } boolNDArray FloatComplexNDArray::isfinite (void) const { - return ArrayN<bool> (fastmap<bool> (xfinite)); + return Array<bool> (fastmap<bool> (xfinite)); } FloatComplexNDArray