fix an inline declaration; some cleanup

This commit is contained in:
Fredrik Johansson 2013-11-11 18:13:56 +01:00
parent 2b60af9281
commit 5a3439de89
5 changed files with 6 additions and 34 deletions

View file

@ -249,7 +249,7 @@ Radius and interval operations
Sets *z* to a ball containing both *x* and *y*.
.. void fmprb_get_abs_ubound_fmpr(fmpr_t u, const fmprb_t x, long prec)
.. function:: void fmprb_get_abs_ubound_fmpr(fmpr_t u, const fmprb_t x, long prec)
Sets *u* to the upper bound of the absolute value of *x*,
rounded up to *prec* bits. If *x* contains NaN, the result is NaN.

View file

@ -161,7 +161,7 @@ fmpcb_mat_scalar_addmul_fmpz(fmpcb_mat_t B, const fmpcb_mat_t A, const fmpz_t c,
fmpcb_addmul_fmpz(fmpcb_mat_entry(B, i, j), fmpcb_mat_entry(A, i, j), c, prec);
}
void
static __inline__ void
fmpcb_mat_scalar_mul_fmpz(fmpcb_mat_t B, const fmpcb_mat_t A, const fmpz_t c, long prec)
{
long i, j;

View file

@ -72,20 +72,6 @@ fmpcb_mat_gauss_partial(fmpcb_mat_t A, long prec)
return rank * sign;
}
static __inline__ void
fmprb_get_fmpr_abs_ubound(fmpr_t u, const fmprb_t x, long prec)
{
if (fmpr_sgn(fmprb_midref(x)) >= 0)
{
fmpr_add(u, fmprb_midref(x), fmprb_radref(x), prec, FMPR_RND_UP);
}
else
{
fmpr_sub(u, fmprb_midref(x), fmprb_radref(x), prec, FMPR_RND_UP);
fmpr_neg(u, u);
}
}
void
fmpcb_vec_get_fmpr_2norm_squared_bound(fmpr_t s, fmpcb_srcptr vec, long len, long prec)
{
@ -97,9 +83,9 @@ fmpcb_vec_get_fmpr_2norm_squared_bound(fmpr_t s, fmpcb_srcptr vec, long len, lon
for (i = 0; i < len; i++)
{
fmprb_get_fmpr_abs_ubound(t, fmpcb_realref(vec + i), prec);
fmprb_get_abs_ubound_fmpr(t, fmpcb_realref(vec + i), prec);
fmpr_addmul(s, t, t, prec, FMPR_RND_UP);
fmprb_get_fmpr_abs_ubound(t, fmpcb_imagref(vec + i), prec);
fmprb_get_abs_ubound_fmpr(t, fmpcb_imagref(vec + i), prec);
fmpr_addmul(s, t, t, prec, FMPR_RND_UP);
}

View file

@ -163,7 +163,7 @@ fmprb_mat_scalar_addmul_fmpz(fmprb_mat_t B, const fmprb_mat_t A, const fmpz_t c,
fmprb_addmul_fmpz(fmprb_mat_entry(B, i, j), fmprb_mat_entry(A, i, j), c, prec);
}
void
static __inline__ void
fmprb_mat_scalar_mul_fmpz(fmprb_mat_t B, const fmprb_mat_t A, const fmpz_t c, long prec)
{
long i, j;

View file

@ -72,20 +72,6 @@ fmprb_mat_gauss_partial(fmprb_mat_t A, long prec)
return rank * sign;
}
static __inline__ void
fmprb_get_fmpr_abs_ubound(fmpr_t u, const fmprb_t x, long prec)
{
if (fmpr_sgn(fmprb_midref(x)) >= 0)
{
fmpr_add(u, fmprb_midref(x), fmprb_radref(x), prec, FMPR_RND_UP);
}
else
{
fmpr_sub(u, fmprb_midref(x), fmprb_radref(x), prec, FMPR_RND_UP);
fmpr_neg(u, u);
}
}
void
fmprb_vec_get_fmpr_2norm_squared_bound(fmpr_t s, fmprb_srcptr vec, long len, long prec)
{
@ -97,7 +83,7 @@ fmprb_vec_get_fmpr_2norm_squared_bound(fmpr_t s, fmprb_srcptr vec, long len, lon
for (i = 0; i < len; i++)
{
fmprb_get_fmpr_abs_ubound(t, vec + i, prec);
fmprb_get_abs_ubound_fmpr(t, vec + i, prec);
fmpr_addmul(s, t, t, prec, FMPR_RND_UP);
}