Mercurial > hg > octave-nkf
comparison libinterp/octave-value/ov-base-sparse.h @ 18805:491b0adfec95
compatibility fixes for printf integer format specifiers
Attempt to handle automatic conversion from integer floating point
format in a way that is more compatible with Matlab behavior,
including working properly for 64-bit integer values.
* ov-base-diag.cc, ov-base-diag.h, ov-base-scalar.cc,
ov-base-scalar.h, ov-base-sparse.cc, ov-base-sparse.h, ov-perm.cc,
ov-perm.h, ov-range.cc, ov-range.h:
Provide fast_elem_extract member function.
* oct-stream.cc, oct-stream.h
(printf_format_list::process_conversion): Ignore modifiers for integer
formats.
(printf_value_cache::curr_val): Store octave_value instead of NDArray.
(printf_value_cache::data): Delete.
(printf_value_cache::have_data): New member variable.
(printf_value_cache::get_next_value): Rename from double_value, return
individual value as an octave_value object instead of a double.
(is_nan_or_inf, ok_for_signed_int_conv, ok_for_unsigned_int_conv,
switch_to_g_format): New static functions.
(DO_DOUBLE_CONV_1, DO_DOUBLE_CONV): Delete macros.
(octave_base_stream::do_numeric_printf_conv): New function.
(octave_base_stream::do_printf): Move code for handling numeric
formats to do_numeric_printf_conv.
* datestr.m: Round value for %d format.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 15 Apr 2014 14:12:56 -0400 |
| parents | bcd71a2531d3 |
| children | 4197fc428c7d |
comparison
equal
deleted
inserted
replaced
| 18804:7485f8a8e431 | 18805:491b0adfec95 |
|---|---|
| 163 | 163 |
| 164 octave_idx_type *mex_get_ir (void) const { return matrix.mex_get_ir (); } | 164 octave_idx_type *mex_get_ir (void) const { return matrix.mex_get_ir (); } |
| 165 | 165 |
| 166 octave_idx_type *mex_get_jc (void) const { return matrix.mex_get_jc (); } | 166 octave_idx_type *mex_get_jc (void) const { return matrix.mex_get_jc (); } |
| 167 | 167 |
| 168 octave_value fast_elem_extract (octave_idx_type n) const; | |
| 169 | |
| 168 protected: | 170 protected: |
| 169 | 171 |
| 170 octave_value map (octave_base_value::unary_mapper_t umap) const; | 172 octave_value map (octave_base_value::unary_mapper_t umap) const; |
| 171 | 173 |
| 172 T matrix; | 174 T matrix; |