Mercurial > octave-nkf
changeset 10024:184060864627
allow ismatrix on character matrices
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Fri, 25 Dec 2009 22:31:25 +0100 |
| parents | 73fc43e01f4c |
| children | acd5e9df38f8 |
| files | src/ChangeLog src/data.cc src/ov-str-mat.h |
| diffstat | 3 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Dec 25 22:20:33 2009 +0100 +++ b/src/ChangeLog Fri Dec 25 22:31:25 2009 +0100 @@ -1,3 +1,9 @@ +2009-12-25 Jaroslav Hajek <highegg@gmail.com> + + * ov-str-mat.h (octave_char_matrix_str::is_matrix_type): Remove + override. + * data.cc (Fismatrix): Update test. + 2009-12-25 Jaroslav Hajek <highegg@gmail.com> * DLD-FUNCTIONS/strfind.cc: New source.
--- a/src/data.cc Fri Dec 25 22:20:33 2009 +0100 +++ b/src/data.cc Fri Dec 25 22:31:25 2009 +0100 @@ -3375,9 +3375,9 @@ %!assert(ismatrix (single([1, 2, 3]))); %!assert(ismatrix (single([1, 2; 3, 4]))); -%!assert(ismatrix ("t"), false); -%!assert(ismatrix ("test"), false); -%!assert(ismatrix (["test"; "ing"]), false); +%!assert(ismatrix ("t")); +%!assert(ismatrix ("test")); +%!assert(ismatrix (["test"; "ing"])); %!test %! s.a = 1;
--- a/src/ov-str-mat.h Fri Dec 25 22:20:33 2009 +0100 +++ b/src/ov-str-mat.h Fri Dec 25 22:31:25 2009 +0100 @@ -109,8 +109,6 @@ bool is_real_type (void) const { return false; } - bool is_matrix_type (void) const { return false; } - bool is_numeric_type (void) const { return false; } double double_value (bool = false) const;