Mercurial > octave-nkf
changeset 8750:8af4ba6b4216
use new reduction ops for char matrices
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Mon, 16 Feb 2009 07:57:03 +0100 |
| parents | 5a7494ee68a3 |
| children | 9f7ce4bf7650 |
| files | liboctave/ChangeLog liboctave/chMatrix.cc liboctave/chNDArray.cc |
| diffstat | 3 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog Mon Feb 16 01:41:06 2009 -0500 +++ b/liboctave/ChangeLog Mon Feb 16 07:57:03 2009 +0100 @@ -1,3 +1,8 @@ +2009-02-16 Jaroslav Hajek <highegg@gmail.com> + + * chMatrix.cc (charMatrix::all, charMatrix::any): Use do_mx_red_op. + * chNDArray.cc (charNDArray::all, charNDArray::any): Ditto. + 2009-02-16 John W. Eaton <jwe@octave.org> * cmd-edit.cc (default_command_editor::do_readline):
--- a/liboctave/chMatrix.cc Mon Feb 16 01:41:06 2009 -0500 +++ b/liboctave/chMatrix.cc Mon Feb 16 07:57:03 2009 +0100 @@ -203,13 +203,13 @@ boolMatrix charMatrix::all (int dim) const { - MX_ALL_OP (dim); + return do_mx_red_op<boolMatrix> (*this, dim, mx_inline_all); } boolMatrix charMatrix::any (int dim) const { - MX_ANY_OP (dim); + return do_mx_red_op<boolMatrix> (*this, dim, mx_inline_any); } MS_CMP_OPS(charMatrix, , char, )
--- a/liboctave/chNDArray.cc Mon Feb 16 01:41:06 2009 -0500 +++ b/liboctave/chNDArray.cc Mon Feb 16 07:57:03 2009 +0100 @@ -36,13 +36,13 @@ boolNDArray charNDArray::all (int dim) const { - MX_ND_ANY_ALL_REDUCTION (MX_ND_ALL_EVAL (elem (iter_idx) == '\0'), true); + return do_mx_red_op<boolMatrix> (*this, dim, mx_inline_all); } boolNDArray charNDArray::any (int dim) const { - MX_ND_ANY_ALL_REDUCTION (MX_ND_ANY_EVAL (elem (iter_idx) != '\0'), false); + return do_mx_red_op<boolMatrix> (*this, dim, mx_inline_any); } charNDArray