long -> slong in acb_calc/ and acb_calc/test.

This commit is contained in:
William Hart 2015-11-05 17:45:18 +00:00
parent 40e8137bd2
commit f4ef71125d
4 changed files with 11 additions and 11 deletions

View file

@ -27,9 +27,9 @@
void void
acb_calc_cauchy_bound(arb_t bound, acb_calc_func_t func, void * param, acb_calc_cauchy_bound(arb_t bound, acb_calc_func_t func, void * param,
const acb_t x, const arb_t radius, long maxdepth, long prec) const acb_t x, const arb_t radius, slong maxdepth, slong prec)
{ {
long i, n, depth, wp; slong i, n, depth, wp;
arb_t pi, theta, v, s1, c1, s2, c2, st, ct; arb_t pi, theta, v, s1, c1, s2, c2, st, ct;
acb_t t, u; acb_t t, u;

View file

@ -32,9 +32,9 @@ acb_calc_integrate_taylor(acb_t res,
const acb_t a, const acb_t b, const acb_t a, const acb_t b,
const arf_t inner_radius, const arf_t inner_radius,
const arf_t outer_radius, const arf_t outer_radius,
long accuracy_goal, long prec) slong accuracy_goal, slong prec)
{ {
long num_steps, step, N, bp; slong num_steps, step, N, bp;
int result; int result;
acb_t delta, m, x, y1, y2, sum; acb_t delta, m, x, y1, y2, sum;
@ -61,7 +61,7 @@ acb_calc_integrate_taylor(acb_t res,
acb_get_abs_ubound_arf(t, delta, bp); acb_get_abs_ubound_arf(t, delta, bp);
arf_div(t, t, inner_radius, bp, ARF_RND_UP); arf_div(t, t, inner_radius, bp, ARF_RND_UP);
arf_mul_2exp_si(t, t, -1); arf_mul_2exp_si(t, t, -1);
num_steps = (long) (arf_get_d(t, ARF_RND_UP) + 1.0); num_steps = (slong) (arf_get_d(t, ARF_RND_UP) + 1.0);
/* make sure it's not something absurd */ /* make sure it's not something absurd */
num_steps = FLINT_MIN(num_steps, 10 * prec); num_steps = FLINT_MIN(num_steps, 10 * prec);
num_steps = FLINT_MAX(num_steps, 1); num_steps = FLINT_MAX(num_steps, 1);

View file

@ -27,7 +27,7 @@
/* sin(x) */ /* sin(x) */
int int
sin_x(acb_ptr out, const acb_t inp, void * params, long order, long prec) sin_x(acb_ptr out, const acb_t inp, void * params, slong order, slong prec)
{ {
int xlen = FLINT_MIN(2, order); int xlen = FLINT_MIN(2, order);
@ -48,7 +48,7 @@ static const double answers[10] = {
int main() int main()
{ {
long iter; slong iter;
flint_rand_t state; flint_rand_t state;
printf("cauchy_bound...."); printf("cauchy_bound....");
@ -60,7 +60,7 @@ int main()
{ {
arb_t b, radius, ans; arb_t b, radius, ans;
acb_t x; acb_t x;
long r, prec, maxdepth; slong r, prec, maxdepth;
arb_init(b); arb_init(b);
arb_init(radius); arb_init(radius);

View file

@ -27,7 +27,7 @@
/* sin(x) */ /* sin(x) */
int int
sin_x(acb_ptr out, const acb_t inp, void * params, long order, long prec) sin_x(acb_ptr out, const acb_t inp, void * params, slong order, slong prec)
{ {
int xlen = FLINT_MIN(2, order); int xlen = FLINT_MIN(2, order);
@ -41,7 +41,7 @@ sin_x(acb_ptr out, const acb_t inp, void * params, long order, long prec)
int main() int main()
{ {
long iter; slong iter;
flint_rand_t state; flint_rand_t state;
printf("integrate_taylor...."); printf("integrate_taylor....");
@ -54,7 +54,7 @@ int main()
acb_t ans, res, a, b; acb_t ans, res, a, b;
arf_t inr, outr; arf_t inr, outr;
double t; double t;
long goal, prec; slong goal, prec;
acb_init(ans); acb_init(ans);
acb_init(res); acb_init(res);