Mercurial > hg > octave-nkf
comparison liboctave/intNDArray.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 | 4c0cdbe0acca |
comparison
equal
deleted
inserted
replaced
9731:7b9cbaad68d6 | 9732:b4fdfee405b5 |
---|---|
229 return do_mx_minmax_op<intNDArray<T> > (*this, dim, mx_inline_max); | 229 return do_mx_minmax_op<intNDArray<T> > (*this, dim, mx_inline_max); |
230 } | 230 } |
231 | 231 |
232 template <class T> | 232 template <class T> |
233 intNDArray<T> | 233 intNDArray<T> |
234 intNDArray<T>::max (ArrayN<octave_idx_type>& idx_arg, int dim) const | 234 intNDArray<T>::max (Array<octave_idx_type>& idx_arg, int dim) const |
235 { | 235 { |
236 return do_mx_minmax_op<intNDArray<T> > (*this, idx_arg, dim, mx_inline_max); | 236 return do_mx_minmax_op<intNDArray<T> > (*this, idx_arg, dim, mx_inline_max); |
237 } | 237 } |
238 | 238 |
239 template <class T> | 239 template <class T> |
243 return do_mx_minmax_op<intNDArray<T> > (*this, dim, mx_inline_min); | 243 return do_mx_minmax_op<intNDArray<T> > (*this, dim, mx_inline_min); |
244 } | 244 } |
245 | 245 |
246 template <class T> | 246 template <class T> |
247 intNDArray<T> | 247 intNDArray<T> |
248 intNDArray<T>::min (ArrayN<octave_idx_type>& idx_arg, int dim) const | 248 intNDArray<T>::min (Array<octave_idx_type>& idx_arg, int dim) const |
249 { | 249 { |
250 return do_mx_minmax_op<intNDArray<T> > (*this, idx_arg, dim, mx_inline_min); | 250 return do_mx_minmax_op<intNDArray<T> > (*this, idx_arg, dim, mx_inline_min); |
251 } | 251 } |
252 | 252 |
253 template <class T> | 253 template <class T> |
257 return do_mx_cumminmax_op<intNDArray<T> > (*this, dim, mx_inline_cummax); | 257 return do_mx_cumminmax_op<intNDArray<T> > (*this, dim, mx_inline_cummax); |
258 } | 258 } |
259 | 259 |
260 template <class T> | 260 template <class T> |
261 intNDArray<T> | 261 intNDArray<T> |
262 intNDArray<T>::cummax (ArrayN<octave_idx_type>& idx_arg, int dim) const | 262 intNDArray<T>::cummax (Array<octave_idx_type>& idx_arg, int dim) const |
263 { | 263 { |
264 return do_mx_cumminmax_op<intNDArray<T> > (*this, idx_arg, dim, mx_inline_cummax); | 264 return do_mx_cumminmax_op<intNDArray<T> > (*this, idx_arg, dim, mx_inline_cummax); |
265 } | 265 } |
266 | 266 |
267 template <class T> | 267 template <class T> |
271 return do_mx_cumminmax_op<intNDArray<T> > (*this, dim, mx_inline_cummin); | 271 return do_mx_cumminmax_op<intNDArray<T> > (*this, dim, mx_inline_cummin); |
272 } | 272 } |
273 | 273 |
274 template <class T> | 274 template <class T> |
275 intNDArray<T> | 275 intNDArray<T> |
276 intNDArray<T>::cummin (ArrayN<octave_idx_type>& idx_arg, int dim) const | 276 intNDArray<T>::cummin (Array<octave_idx_type>& idx_arg, int dim) const |
277 { | 277 { |
278 return do_mx_cumminmax_op<intNDArray<T> > (*this, idx_arg, dim, mx_inline_cummin); | 278 return do_mx_cumminmax_op<intNDArray<T> > (*this, idx_arg, dim, mx_inline_cummin); |
279 } | 279 } |
280 | 280 |
281 template <class T> | 281 template <class T> |