# HG changeset patch # User Jaroslav Hajek # Date 1261776685 -3600 # Node ID 1840608646273be9a3dae268adacf3dcaf25a96a # Parent 73fc43e01f4cd7d7bab41f1fe2ce9246bc58f4a5 allow ismatrix on character matrices diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2009-12-25 Jaroslav Hajek + + * ov-str-mat.h (octave_char_matrix_str::is_matrix_type): Remove + override. + * data.cc (Fismatrix): Update test. + 2009-12-25 Jaroslav Hajek * DLD-FUNCTIONS/strfind.cc: New source. diff --git a/src/data.cc b/src/data.cc --- a/src/data.cc +++ b/src/data.cc @@ -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; diff --git a/src/ov-str-mat.h b/src/ov-str-mat.h --- a/src/ov-str-mat.h +++ b/src/ov-str-mat.h @@ -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;