Merge branch 'merge_upstream' into dirichlet

This commit is contained in:
Pascal 2016-10-08 22:55:23 +02:00
commit 45b82b3f5c

View file

@ -15,6 +15,17 @@
void
acb_fprintn(FILE * file, const acb_t z, long digits, ulong flags)
{
if (arb_is_zero(acb_imagref(z)))
{
arb_fprintn(file, acb_realref(z), digits, flags);
}
else if (arb_is_zero(acb_realref(z)))
{
arb_fprintn(file, acb_imagref(z), digits, flags);
flint_fprintf(file, "*I");
}
else
{
arb_fprintn(file, acb_realref(z), digits, flags);
if ((arb_is_exact(acb_imagref(z)) || (flags & ARB_STR_NO_RADIUS))
@ -34,5 +45,6 @@ acb_fprintn(FILE * file, const acb_t z, long digits, ulong flags)
}
flint_fprintf(file, "*I");
}
}