comparison libinterp/octave-value/ov-perm.cc @ 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 bae00174787c
children 6113e0c6920b
comparison
equal deleted inserted replaced
18804:7485f8a8e431 18805:491b0adfec95
446 retval = new octave_scalar (matrix (0, 0)); 446 retval = new octave_scalar (matrix (0, 0));
447 447
448 return retval; 448 return retval;
449 } 449 }
450 450
451 octave_value
452 octave_perm_matrix::fast_elem_extract (octave_idx_type n) const
453 {
454 if (n < matrix.numel ())
455 {
456 octave_idx_type nr = matrix.rows ();
457
458 octave_idx_type r = n % nr;
459 octave_idx_type c = n / nr;
460
461 return octave_value (matrix.elem (r, c));
462 }
463 else
464 return octave_value ();
465 }