hiro/arb
1
0
Fork 0
mirror of https://github.com/vale981/arb synced 2025-03-04 17:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix

Browse source
This commit is contained in:
Fredrik Johansson 2014-05-14 12:04:08 +02:00
parent f5d37425f5
commit 08a8513462
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arb_poly/newton_step.c
View file

@ -55,7 +55,7 @@ _arb_poly_newton_step(arb_t xnew, arb_srcptr poly, long len,
arb_add_error_arf(u, err);
if (arb_contains(convergence_interval, u) &&
(arf_cmpabs_mag(arb_radref(u), arb_radref(x)) < 0))
(mag_cmp(arb_radref(u), arb_radref(x)) < 0))
{
arb_swap(xnew, u);
result = 1;

25
mag.h
View file

@ -548,6 +548,31 @@ mag_get_fmpq(fmpq_t y, const mag_t x)
fmpr_clear(t);
}
/* TODO: document/test */
static __inline__ int
mag_cmp(const mag_t x, const mag_t y)
{
int c;
if (mag_equal(x, y))
return 0;
if (mag_is_special(x) || mag_is_special(y))
{
if (mag_is_zero(x)) return -1;
if (mag_is_zero(y)) return 1;
if (mag_is_inf(x)) return 1;
if (mag_is_inf(y)) return -1;
}
c = fmpz_cmp(MAG_EXPREF(x), MAG_EXPREF(y));
if (c == 0)
return (MAG_MAN(x) < MAG_MAN(y)) ? -1 : 1;
return (c < 0) ? -1 : 1;
}
#ifdef __cplusplus
}
#endif