diff options
| -rw-r--r-- | doc/FAQ.html | 4 | ||||
| -rw-r--r-- | doc/algorithms.tex | 8 | ||||
| -rw-r--r-- | src/get_f.c | 4 | ||||
| -rw-r--r-- | src/set_inf.c | 2 | ||||
| -rw-r--r-- | tests/tsqrt.c | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/doc/FAQ.html b/doc/FAQ.html index cd8a81b9a..c0f2a86f6 100644 --- a/doc/FAQ.html +++ b/doc/FAQ.html @@ -188,8 +188,8 @@ infinities, not-a-number (NaN).</p></li> <dd><p>You need to add <q><code>r</code></q> to the function names, and to specify the rounding mode (<code>MPFR_RNDN</code> for rounding to nearest, <code>MPFR_RNDZ</code> for rounding toward zero, <code>MPFR_RNDU</code> -for rounding toward plus infinity, <code>MPFR_RNDD</code> for rounding -toward minus infinity). You can also define macros as follows: +for rounding toward positive infinity, <code>MPFR_RNDD</code> for rounding +toward negative infinity). You can also define macros as follows: <code class="block-code">#define mpf_add(a, b, c) mpfr_add(a, b, c, MPFR_RNDN)</code></p> <p>The header file <samp>mpf2mpfr.h</samp> from the <cite><acronym>MPFR</acronym></cite> distribution automatically diff --git a/doc/algorithms.tex b/doc/algorithms.tex index 63d1704c0..9b11d0491 100644 --- a/doc/algorithms.tex +++ b/doc/algorithms.tex @@ -85,8 +85,8 @@ Algorithms and Proofs} In the whole document, $\N()$ denotes rounding to nearest, $\Z()$ rounding toward zero, -$\pinf()$ rounding toward plus infinity, -$\minf()$ rounding toward minus infinity, +$\pinf()$ rounding toward positive infinity, +$\minf()$ rounding toward negative infinity, and $\circ()$ any of those four rounding modes. In the whole document, except special notice, all variables are assumed @@ -2414,12 +2414,12 @@ When rounding to nearest, if $p_x \leq p_z$ and $\frac{p_z+1}{2} < \Exp(x) - p_x$, the condition $\frac{p_x+1}{2} < \Exp(x) - \Exp(y)$ ensures that $\frac{y^2}{2x} < \frac{1}{2} \ulp_{p_x}(x)$. In both cases, these inequalities show that $z=\N_{p_z}(x)$, except that tie case is rounded -toward plus infinity since hypot($x$,$y$) is strictly greater than $x$. +toward positive infinity since hypot($x$,$y$) is strictly greater than $x$. With the other rounding modes, the conditions $p_z/2 < \Exp(x) - \Exp(y)$ if $p_x \leq p_z$, and $p_x/2 < \Exp(x) - \Exp(y)$ if $p_z < p_x$ mean in a similar way that $z=\circ_{p_z}(x)$, except that we need to add one ulp -to the result when rounding toward plus infinity and $x$ is exactly +to the result when rounding toward positive infinity and $x$ is exactly representable with $p_z$ bits of precision. When none of the above conditions are satisfied, we use the following diff --git a/src/get_f.c b/src/get_f.c index e8d7a4c0a..869c4bc2f 100644 --- a/src/get_f.c +++ b/src/get_f.c @@ -49,8 +49,8 @@ mpfr_get_f (mpf_ptr x, mpfr_srcptr y, mpfr_rnd_t rnd_mode) MPFR_SET_ERANGEFLAG (); return 0; } - else /* y is plus infinity (resp. minus infinity), set x to the maximum - value (resp. the minimum value) in precision PREC(x) */ + else /* y is +inf (resp. -inf); set x to the maximum value + (resp. the minimum value) in precision PREC(x) */ { int i; mp_limb_t *xp; diff --git a/src/set_inf.c b/src/set_inf.c index 2d9d7c276..5388549b4 100644 --- a/src/set_inf.c +++ b/src/set_inf.c @@ -1,4 +1,4 @@ -/* mpfr_set_inf -- set a number to plus or minus infinity. +/* mpfr_set_inf -- set a number to positive or negative infinity. Copyright 2002, 2004, 2006-2021 Free Software Foundation, Inc. Contributed by the AriC and Caramba projects, INRIA. diff --git a/tests/tsqrt.c b/tests/tsqrt.c index f2bbcd773..9d810fc5c 100644 --- a/tests/tsqrt.c +++ b/tests/tsqrt.c @@ -175,7 +175,7 @@ check_float (void) check24("281474876047360.0", MPFR_RNDD, "1.6777212e7"); check24("91214552498176.0", MPFR_RNDD, "9.550631e6"); - /* check that rounding away is just rounding toward plus infinity */ + /* check that rounding away is just rounding toward positive infinity */ check24("91214552498176.0", MPFR_RNDA, "9.550632e6"); } @@ -1053,7 +1053,7 @@ main (void) check4 ("72154663483843080704304789585920.0", MPFR_RNDD, "1.e2d9a51977e6d@13"); - /* check that rounding away is just rounding toward plus infinity */ + /* check that rounding away is just rounding toward positive infinity */ check4 ("72154663483843080704304789585920.0", MPFR_RNDA, "1.e2d9a51977e6e@13"); |