Mercurial > octave
changeset 28636:a3db48e66ef8
use Range::increment instead of Range::inc
This change is a step toward replacing the current Range class with
the new range template class.
* Range.h (Range::increment): New function. Change all uses of
Range::inc to use Range::increment instead.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 06 Aug 2020 15:09:30 -0400 |
| parents | b6371946f106 |
| children | fb37f50d5ba8 |
| files | libinterp/corefcn/__magick_read__.cc libinterp/corefcn/data.cc libinterp/corefcn/ls-mat4.cc libinterp/corefcn/max.cc libinterp/corefcn/pr-output.cc libinterp/corefcn/rand.cc libinterp/corefcn/xpow.cc libinterp/octave-value/ov-range.cc liboctave/array/Range.cc liboctave/array/Range.h liboctave/array/idx-vector.cc |
| diffstat | 11 files changed, 33 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/__magick_read__.cc Thu Aug 06 13:53:07 2020 -0400 +++ b/libinterp/corefcn/__magick_read__.cc Thu Aug 06 15:09:30 2020 -0400 @@ -192,8 +192,8 @@ m_row_cache = m_row_end - m_row_start + 1; m_col_cache = m_col_end - m_col_start + 1; - m_row_shift = m_col_cache * rows.inc (); - m_col_shift = m_col_cache * (m_row_cache + rows.inc () - 1) - cols.inc (); + m_row_shift = m_col_cache * rows.increment (); + m_col_shift = m_col_cache * (m_row_cache + rows.increment () - 1) - cols.increment (); m_row_out = rows.numel (); m_col_out = cols.numel ();
--- a/libinterp/corefcn/data.cc Thu Aug 06 13:53:07 2020 -0400 +++ b/libinterp/corefcn/data.cc Thu Aug 06 15:09:30 2020 -0400 @@ -7221,7 +7221,7 @@ if (vals.is_range ()) { Range r = vals.range_value (); - if (r.inc () == 0) + if (r.increment () == 0) vals = r.base (); }
--- a/libinterp/corefcn/ls-mat4.cc Thu Aug 06 13:53:07 2020 -0400 +++ b/libinterp/corefcn/ls-mat4.cc Thu Aug 06 15:09:30 2020 -0400 @@ -467,7 +467,7 @@ { Range r = tc.range_value (); double base = r.base (); - double inc = r.inc (); + double inc = r.increment (); octave_idx_type nel = r.numel (); for (octave_idx_type i = 0; i < nel; i++) {
--- a/libinterp/corefcn/max.cc Thu Aug 06 13:53:07 2020 -0400 +++ b/libinterp/corefcn/max.cc Thu Aug 06 15:09:30 2020 -0400 @@ -281,14 +281,14 @@ retval(0) = range.min (); if (nargout > 1) retval(1) = static_cast<double> - (range.inc () < 0 ? range.numel () : 1); + (range.increment () < 0 ? range.numel () : 1); } else { retval(0) = range.max (); if (nargout > 1) retval(1) = static_cast<double> - (range.inc () >= 0 ? range.numel () : 1); + (range.increment () >= 0 ? range.numel () : 1); } } else if (arg.issparse ())
--- a/libinterp/corefcn/pr-output.cc Thu Aug 06 13:53:07 2020 -0400 +++ b/libinterp/corefcn/pr-output.cc Thu Aug 06 15:09:30 2020 -0400 @@ -2492,7 +2492,7 @@ bool pr_as_read_syntax, int extra_indent) { double base = r.base (); - double increment = r.inc (); + double increment = r.increment (); double limit = r.limit (); octave_idx_type num_elem = r.numel ();
--- a/libinterp/corefcn/rand.cc Thu Aug 06 13:53:07 2020 -0400 +++ b/libinterp/corefcn/rand.cc Thu Aug 06 15:09:30 2020 -0400 @@ -191,7 +191,7 @@ dims.resize (n); octave_idx_type base = octave::math::nint_big (r.base ()); - octave_idx_type incr = octave::math::nint_big (r.inc ()); + octave_idx_type incr = octave::math::nint_big (r.increment ()); for (octave_idx_type i = 0; i < n; i++) {
--- a/libinterp/corefcn/xpow.cc Thu Aug 06 13:53:07 2020 -0400 +++ b/libinterp/corefcn/xpow.cc Thu Aug 06 15:09:30 2020 -0400 @@ -722,10 +722,10 @@ { octave_idx_type n = r.numel (); Matrix result (1, n); - if (same_sign (r.base (), r.inc ())) + if (same_sign (r.base (), r.increment ())) { double base = std::pow (a, r.base ()); - double inc = std::pow (a, r.inc ()); + double inc = std::pow (a, r.increment ()); result(0) = base; for (octave_idx_type i = 1; i < n; i++) result(i) = (base *= inc); @@ -733,8 +733,8 @@ else { // Don't use Range::limit () here. - double limit = std::pow (a, r.base () + (n-1) * r.inc ()); - double inc = std::pow (a, -r.inc ()); + double limit = std::pow (a, r.base () + (n-1) * r.increment ()); + double inc = std::pow (a, -r.increment ()); result(n-1) = limit; for (octave_idx_type i = n-2; i >= 0; i--) result(i) = (limit *= inc); @@ -952,10 +952,10 @@ octave_idx_type n = r.numel (); ComplexMatrix result (1, n); - if (same_sign (r.base (), r.inc ())) + if (same_sign (r.base (), r.increment ())) { Complex base = std::pow (a, r.base ()); - Complex inc = std::pow (a, r.inc ()); + Complex inc = std::pow (a, r.increment ()); result(0) = base; for (octave_idx_type i = 1; i < n; i++) result(i) = (base *= inc); @@ -963,8 +963,8 @@ else { // Don't use Range::limit () here. - Complex limit = std::pow (a, r.base () + (n-1) * r.inc ()); - Complex inc = std::pow (a, -r.inc ()); + Complex limit = std::pow (a, r.base () + (n-1) * r.increment ()); + Complex inc = std::pow (a, -r.increment ()); result(n-1) = limit; for (octave_idx_type i = n-2; i >= 0; i--) result(i) = (limit *= inc);
--- a/libinterp/octave-value/ov-range.cc Thu Aug 06 13:53:07 2020 -0400 +++ b/libinterp/octave-value/ov-range.cc Thu Aug 06 15:09:30 2020 -0400 @@ -481,8 +481,8 @@ if (len > 1) { - if (m_range.inc () != 1) - os << m_range.inc () << ':'; + if (m_range.increment () != 1) + os << m_range.increment () << ':'; os << m_range.limit (); } @@ -527,7 +527,7 @@ Range r = range_value (); double base = r.base (); double limit = r.limit (); - double inc = r.inc (); + double inc = r.increment (); octave_idx_type len = r.numel (); if (inc != 0) @@ -576,7 +576,7 @@ Range r = range_value (); double bas = r.base (); double lim = r.limit (); - double inc = r.inc (); + double inc = r.increment (); if (inc == 0) lim = r.numel (); @@ -674,8 +674,8 @@ Range r = range_value (); double range_vals[3]; range_vals[0] = r.base (); - range_vals[1] = (r.inc () != 0 ? r.limit () : r.numel ()); - range_vals[2] = r.inc (); + range_vals[1] = (r.increment () != 0 ? r.limit () : r.numel ()); + range_vals[2] = r.increment (); if (H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, range_vals)
--- a/liboctave/array/Range.cc Thu Aug 06 13:53:07 2020 -0400 +++ b/liboctave/array/Range.cc Thu Aug 06 15:09:30 2020 -0400 @@ -600,7 +600,7 @@ operator << (std::ostream& os, const Range& a) { double b = a.base (); - double increment = a.inc (); + double increment = a.increment (); octave_idx_type nel = a.numel (); if (nel > 1) @@ -639,37 +639,37 @@ Range operator - (const Range& r) { - return Range (-r.base (), -r.limit (), -r.inc (), r.numel ()); + return Range (-r.base (), -r.limit (), -r.increment (), r.numel ()); } Range operator + (double x, const Range& r) { - return Range (x + r.base (), x + r.limit (), r.inc (), r.numel ()); + return Range (x + r.base (), x + r.limit (), r.increment (), r.numel ()); } Range operator + (const Range& r, double x) { - return Range (r.base () + x, r.limit () + x, r.inc (), r.numel ()); + return Range (r.base () + x, r.limit () + x, r.increment (), r.numel ()); } Range operator - (double x, const Range& r) { - return Range (x - r.base (), x - r.limit (), -r.inc (), r.numel ()); + return Range (x - r.base (), x - r.limit (), -r.increment (), r.numel ()); } Range operator - (const Range& r, double x) { - return Range (r.base () - x, r.limit () - x, r.inc (), r.numel ()); + return Range (r.base () - x, r.limit () - x, r.increment (), r.numel ()); } Range operator * (double x, const Range& r) { - return Range (x * r.base (), x * r.limit (), x * r.inc (), r.numel ()); + return Range (x * r.base (), x * r.limit (), x * r.increment (), r.numel ()); } Range operator * (const Range& r, double x) { - return Range (r.base () * x, r.limit () * x, r.inc () * x, r.numel ()); + return Range (r.base () * x, r.limit () * x, r.increment () * x, r.numel ()); } // C See Knuth, Art Of Computer Programming, Vol. 1, Problem 1.2.4-5.
--- a/liboctave/array/Range.h Thu Aug 06 13:53:07 2020 -0400 +++ b/liboctave/array/Range.h Thu Aug 06 15:09:30 2020 -0400 @@ -412,6 +412,7 @@ double base (void) const { return m_base; } double limit (void) const { return m_limit; } double inc (void) const { return m_inc; } + double increment (void) const { return m_inc; } octave_idx_type numel (void) const { return m_numel; }
--- a/liboctave/array/idx-vector.cc Thu Aug 06 13:53:07 2020 -0400 +++ b/liboctave/array/idx-vector.cc Thu Aug 06 15:09:30 2020 -0400 @@ -143,7 +143,7 @@ if (r.all_elements_are_ints ()) { start = static_cast<octave_idx_type> (r.base ()) - 1; - step = static_cast<octave_idx_type> (r.inc ()); + step = static_cast<octave_idx_type> (r.increment ()); if (start < 0) octave::err_invalid_index (start); if (step < 0 && start + (len - 1)*step < 0) @@ -153,7 +153,7 @@ { // find first non-integer, then gripe about it double b = r.base (); - double inc = r.inc (); + double inc = r.increment (); octave::err_invalid_index (b != std::trunc (b) ? b : b + inc); } }