Mercurial > octave
diff liboctave/lo-mappers.cc @ 5389:25c8956d2204
[project @ 2005-06-15 03:45:46 by jwe]
| author | jwe |
|---|---|
| date | Wed, 15 Jun 2005 03:45:49 +0000 |
| parents | 4c8a2e4e0717 |
| children | ace8d8d26933 |
line wrap: on
line diff
--- a/liboctave/lo-mappers.cc Tue Jun 14 20:04:31 2005 +0000 +++ b/liboctave/lo-mappers.cc Wed Jun 15 03:45:49 2005 +0000 @@ -129,7 +129,7 @@ bool octave_is_NaN_or_NA (double x) { - return lo_ieee_is_NaN_or_NA (x); + return lo_ieee_isnan (x); } // (double, double) -> double mappers. @@ -145,9 +145,9 @@ if (y <= x) return y; - if (octave_is_NaN_or_NA (x) && ! octave_is_NaN_or_NA (y)) + if (xisnan (x) && ! xisnan (y)) return y; - else if (octave_is_NaN_or_NA (y) && ! octave_is_NaN_or_NA (x)) + else if (xisnan (y) && ! xisnan (x)) return x; else if (octave_is_NA (x) || octave_is_NA (y)) return octave_NA; @@ -164,9 +164,9 @@ if (y >= x) return y; - if (octave_is_NaN_or_NA (x) && ! octave_is_NaN_or_NA (y)) + if (xisnan (x) && ! xisnan (y)) return y; - else if (octave_is_NaN_or_NA (y) && ! octave_is_NaN_or_NA (x)) + else if (xisnan (y) && ! xisnan (x)) return x; else if (octave_is_NA (x) || octave_is_NA (y)) return octave_NA; @@ -262,8 +262,8 @@ double rx = real (x); double ix = imag (x); - return (xfinite (rx) && ! octave_is_NaN_or_NA (rx) - && xfinite (ix) && ! octave_is_NaN_or_NA (ix)); + return (xfinite (rx) && ! xisnan (rx) + && xfinite (ix) && ! xisnan (ix)); } bool @@ -281,7 +281,7 @@ bool octave_is_NaN_or_NA (const Complex& x) { - return (octave_is_NaN_or_NA (real (x)) || octave_is_NaN_or_NA (imag (x))); + return (xisnan (real (x)) || xisnan (imag (x))); } // (complex, complex) -> complex mappers.