Mercurial > hg > octave-lyh
diff liboctave/fNDArray.cc @ 8736:53b4fdeacc2e
improve reduction functions
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Fri, 13 Feb 2009 21:04:50 +0100 |
| parents | a1ae2aae903e |
| children | 1bd918cfb6e2 |
line wrap: on
line diff
--- a/liboctave/fNDArray.cc +++ b/liboctave/fNDArray.cc @@ -658,31 +658,31 @@ FloatNDArray FloatNDArray::cumprod (int dim) const { - MX_ND_CUMULATIVE_OP (FloatNDArray, float, 1, *); + return do_mx_cum_op<FloatNDArray> (*this, dim, mx_inline_cumprod); } FloatNDArray FloatNDArray::cumsum (int dim) const { - MX_ND_CUMULATIVE_OP (FloatNDArray, float, 0, +); + return do_mx_cum_op<FloatNDArray> (*this, dim, mx_inline_cumsum); } FloatNDArray FloatNDArray::prod (int dim) const { - MX_ND_REDUCTION (retval(result_idx) *= elem (iter_idx), 1, FloatNDArray); + return do_mx_red_op<FloatNDArray> (*this, dim, mx_inline_prod); +} + +FloatNDArray +FloatNDArray::sum (int dim) const +{ + return do_mx_red_op<FloatNDArray> (*this, dim, mx_inline_sum); } FloatNDArray FloatNDArray::sumsq (int dim) const { - MX_ND_REDUCTION (retval(result_idx) += std::pow (elem (iter_idx), 2), 0, FloatNDArray); -} - -FloatNDArray -FloatNDArray::sum (int dim) const -{ - MX_ND_REDUCTION (retval(result_idx) += elem (iter_idx), 0, FloatNDArray); + return do_mx_red_op<FloatNDArray> (*this, dim, mx_inline_sumsq); } FloatNDArray