Mercurial > hg > octave-lyh
diff liboctave/array/chNDArray.h @ 16370:7ce21619a4b9
min Matlab compatibility issue (bug #33530)
* max.cc (do_minmax_red_op<charNDArray>,
do_minmax_bin_op<charNDArray>): New specializations.
(do_minmax_body): Handle char arrays. New tests.
* chNDArray.h, chNDArray.cc (charNDArray::min, charNDArray::max):
New functions.
| author | Axel Mathéi <axel.mathei@gmail.com> |
|---|---|
| date | Tue, 26 Mar 2013 10:43:42 -0400 |
| parents | 648dabbb4c6b |
| children |
line wrap: on
line diff
--- a/liboctave/array/chNDArray.h +++ b/liboctave/array/chNDArray.h @@ -73,6 +73,11 @@ charNDArray concat (const charNDArray& rb, const Array<octave_idx_type>& ra_idx); charNDArray concat (const NDArray& rb, const Array<octave_idx_type>& ra_idx); + charNDArray max (int dim = -1) const; + charNDArray max (Array<octave_idx_type>& index, int dim = -1) const; + charNDArray min (int dim = -1) const; + charNDArray min (Array<octave_idx_type>& index, int dim = -1) const; + charNDArray& insert (const charNDArray& a, octave_idx_type r, octave_idx_type c); charNDArray& insert (const charNDArray& a, const Array<octave_idx_type>& ra_idx); @@ -97,6 +102,13 @@ charNDArray diag (octave_idx_type m, octave_idx_type n) const; }; +extern OCTAVE_API charNDArray min (char d, const charNDArray& m); +extern OCTAVE_API charNDArray min (const charNDArray& m, char d); +extern OCTAVE_API charNDArray min (const charNDArray& a, const charNDArray& b); +extern OCTAVE_API charNDArray max (char d, const charNDArray& m); +extern OCTAVE_API charNDArray max (const charNDArray& m, char d); +extern OCTAVE_API charNDArray max (const charNDArray& a, const charNDArray& b); + NDS_CMP_OP_DECLS (charNDArray, char, OCTAVE_API) NDS_BOOL_OP_DECLS (charNDArray, char, OCTAVE_API)