Mercurial > octave-nkf
changeset 3751:1ae5be669422
[project @ 2000-12-10 06:03:06 by jwe]
author | jwe |
---|---|
date | Sun, 10 Dec 2000 06:03:06 +0000 |
parents | c922e2d23c8c |
children | 719a44ff67c9 |
files | liboctave/ChangeLog liboctave/Range.cc |
diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog Sat Dec 09 07:34:12 2000 +0000 +++ b/liboctave/ChangeLog Sun Dec 10 06:03:06 2000 +0000 @@ -1,5 +1,8 @@ 2000-12-09 John W. Eaton <jwe@bevo.che.wisc.edu> + * Range.cc (Range::nelem_internal): Call round here, not tfloor. + Rename n_intervals to be n_elt. + * strptime.c: Surround everything after including config.h in #ifndef HAVE_STRPTIME ... #endif.
--- a/liboctave/Range.cc Sat Dec 09 07:34:12 2000 +0000 +++ b/liboctave/Range.cc Sun Dec 10 06:03:06 2000 +0000 @@ -235,11 +235,11 @@ { double ct = 3.0 * DBL_EPSILON; - double tmp = tfloor ((rng_limit - rng_base + rng_inc) / rng_inc, ct); + double tmp = round ((rng_limit - rng_base + rng_inc) / rng_inc, ct); - int n_intervals = (tmp > 0.0 ? static_cast<int> (tmp) : 0); + int n_elt = (tmp > 0.0 ? static_cast<int> (tmp) : 0); - return (n_intervals >= INT_MAX - 1) ? -1 : n_intervals; + return (n_elt >= INT_MAX - 1) ? -1 : n_elt; } /*