Mercurial > octave-nkf
changeset 4698:737fd5c0ae06
[project @ 2004-01-19 19:25:26 by jwe]
| author | jwe |
|---|---|
| date | Mon, 19 Jan 2004 19:25:27 +0000 |
| parents | c26904f532f1 |
| children | 5e2c68946f30 |
| files | liboctave/ChangeLog liboctave/lo-ieee.cc src/DLD-FUNCTIONS/daspk.cc src/DLD-FUNCTIONS/dassl.cc |
| diffstat | 4 files changed, 70 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog Fri Jan 16 17:49:20 2004 +0000 +++ b/liboctave/ChangeLog Mon Jan 19 19:25:27 2004 +0000 @@ -1,3 +1,10 @@ +2004-01-19 John W. Eaton <jwe@bevo.che.wisc.edu> + + * lo-ieee.cc (octave_ieee_init): Ensure that octave_Inf, + octave_NaN, and octav_NA values are always initialized. Check + floating point format, not HAVE_ISINF, HAVE_FINITE, or HAVE_ISNAN + to decide whether to do IEEE initialization. + 2004-01-06 David Bateman <dbateman@free.fr> * CNDArray.cc (ComplexNDArray::any_element_is_inf_or_nan,
--- a/liboctave/lo-ieee.cc Fri Jan 16 17:49:20 2004 +0000 +++ b/liboctave/lo-ieee.cc Mon Jan 19 19:25:27 2004 +0000 @@ -45,73 +45,89 @@ #endif #endif +#include "lo-error.h" #include "lo-ieee.h" #include "mach-info.h" void octave_ieee_init (void) { + // Default values. DBL_MAX is not right for NaN and NA, but do you + // have a better suggestion? If you don't have IEEE floating point + // values, there are many parts of Octave that will not work + // correctly. + + octave_Inf = octave_NaN = octave_NA = DBL_MAX; + oct_mach_info::float_format ff = oct_mach_info::native_float_format (); - if (ff == oct_mach_info::flt_fmt_vax_d - || ff == oct_mach_info::flt_fmt_vax_g - || ff == oct_mach_info::flt_fmt_cray) + switch (ff) { - octave_Inf = octave_NaN = octave_NA = DBL_MAX; - } - else - { -#if defined (HAVE_ISINF) || defined (HAVE_FINITE) + case oct_mach_info::flt_fmt_ieee_big_endian: + case oct_mach_info::flt_fmt_ieee_little_endian: + { + // Don't optimize away tmp_inf / tmp_inf to generate octave_NaN. + + volatile double tmp_inf; #if defined (SCO) - double tmp = 1.0; - octave_Inf = 1.0 / (tmp - tmp); + volatile double tmp = 1.0; + tmp_inf = 1.0 / (tmp - tmp); #elif defined (__alpha__) && defined (__osf__) - extern unsigned int DINFINITY[2]; - octave_Inf = (*(X_CAST(double *, DINFINITY))); + extern unsigned int DINFINITY[2]; + tmp_inf = (*(X_CAST(double *, DINFINITY))); #else - double tmp = 1e+10; - octave_Inf = tmp; - for (;;) - { - octave_Inf *= 1e+10; - if (octave_Inf == tmp) - break; - tmp = octave_Inf; - } + double tmp = 1e+10; + tmp_inf = tmp; + for (;;) + { + tmp_inf *= 1e+10; + if (tmp_inf == tmp) + break; + tmp = tmp_inf; + } #endif -#endif - -#if defined (HAVE_ISNAN) - #if defined (__alpha__) && defined (__osf__) - extern unsigned int DQNAN[2]; - octave_NaN = (*(X_CAST(double *, DQNAN))); + extern unsigned int DQNAN[2]; + octave_NaN = (*(X_CAST(double *, DQNAN))); #else - octave_NaN = octave_Inf / octave_Inf; + octave_NaN = tmp_inf / tmp_inf; #endif - // This is patterned after code in R. + octave_Inf = tmp_inf; + + // This is patterned after code in R. + + if (ff == oct_mach_info::flt_fmt_ieee_big_endian) + { + lo_ieee_hw = 0; + lo_ieee_lw = 1; + } + else + { + lo_ieee_hw = 1; + lo_ieee_lw = 0; + } - if (ff == oct_mach_info::flt_fmt_ieee_big_endian) - { - lo_ieee_hw = 0; - lo_ieee_lw = 1; - } - else - { - lo_ieee_hw = 1; - lo_ieee_lw = 0; - } + lo_ieee_double t; + t.word[lo_ieee_hw] = LO_IEEE_NA_HW; + t.word[lo_ieee_lw] = LO_IEEE_NA_LW; + + octave_NA = t.value; + } + break; - lo_ieee_double t; - t.word[lo_ieee_hw] = LO_IEEE_NA_HW; - t.word[lo_ieee_lw] = LO_IEEE_NA_LW; + case oct_mach_info::flt_fmt_cray: + case oct_mach_info::flt_fmt_vax_d: + case oct_mach_info::flt_fmt_vax_g: + break; - octave_NA = t.value; - -#endif + default: + // If the format is unknown, then you will probably not have a + // useful system, but we will just issue a warning and go on... + (*current_liboctave_warning_handler) + ("lo_ieee_init: unrecognized floating point format!"); } }