From 9296c22c7ebfb9b21a2e1b90bad42ddc14720372 Mon Sep 17 00:00:00 2001 From: Edgar Costa Date: Mon, 25 Mar 2024 21:11:54 +0100 Subject: [PATCH] making argument names in non inline functions to match documentation --- src/acb.h | 84 ++++++++++++++--------------- src/acb_dft.h | 24 ++++----- src/acb_dirichlet.h | 22 ++++---- src/acb_elliptic.h | 20 +++---- src/acb_hypgeom.h | 90 ++++++++++++++++---------------- src/acb_mat.h | 18 +++---- src/acb_modular.h | 12 ++--- src/acb_poly.h | 96 +++++++++++++++++----------------- src/acb_theta.h | 2 +- src/aprcl.h | 8 +-- src/arb.h | 66 +++++++++++------------ src/arb_fmpz_poly.h | 18 +++---- src/arb_hypgeom.h | 86 +++++++++++++++--------------- src/arb_mat.h | 20 +++---- src/arb_poly.h | 110 +++++++++++++++++++------------------- src/arf.h | 50 +++++++++--------- src/arith.h | 2 +- src/bernoulli.h | 4 +- src/bool_mat.h | 18 +++---- src/ca.h | 34 ++++++------ src/ca_field.h | 2 +- src/ca_mat.h | 40 +++++++------- src/ca_poly.h | 18 +++---- src/ca_vec.h | 10 ++-- src/calcium.h | 2 +- src/dirichlet.h | 14 ++--- src/fexpr.h | 14 ++--- src/fmpq.h | 20 +++---- src/fmpq_poly.h | 34 ++++++------ src/fmpq_vec.h | 2 +- src/fmpz.h | 70 ++++++++++++------------- src/fmpz_extras.h | 2 +- src/fmpz_factor.h | 2 +- src/fmpz_mat.h | 12 ++--- src/fmpz_mod.h | 4 +- src/fmpz_mod_mat.h | 2 +- src/fmpz_mod_mpoly.h | 6 +-- src/fmpz_mod_poly.h | 12 ++--- src/fmpz_mpoly.h | 18 +++---- src/fmpz_mpoly_q.h | 2 +- src/fmpz_poly.h | 22 ++++---- src/fmpz_poly_factor.h | 2 +- src/fmpzi.h | 4 +- src/fq.h | 8 +-- src/fq_nmod.h | 4 +- src/fq_nmod_mpoly.h | 2 +- src/fq_zech.h | 8 +-- src/gr.h | 6 +-- src/gr_mat.h | 72 ++++++++++++------------- src/gr_mpoly.h | 4 +- src/gr_poly.h | 72 ++++++++++++------------- src/gr_vec.h | 2 +- src/hypgeom.h | 4 +- src/mag.h | 116 ++++++++++++++++++++--------------------- src/mpfr_vec.h | 16 +++--- src/mpn_extras.h | 12 ++--- src/nf_elem.h | 20 +++---- src/nmod_mat.h | 6 +-- src/nmod_mpoly.h | 2 +- src/nmod_poly.h | 16 +++--- src/padic.h | 10 ++-- src/padic_mat.h | 4 +- src/padic_poly.h | 10 ++-- src/qadic.h | 4 +- src/qqbar.h | 22 ++++---- src/thread_pool.h | 2 +- src/ulong_extras.h | 6 +-- 67 files changed, 763 insertions(+), 763 deletions(-) diff --git a/src/acb.h b/src/acb.h index df4991311b..75b0202260 100644 --- a/src/acb.h +++ b/src/acb.h @@ -326,9 +326,9 @@ acb_add_error_arb(acb_t x, const arb_t err) arb_add_error(acb_imagref(x), err); } -void acb_get_mag(mag_t z, const acb_t x); +void acb_get_mag(mag_t u, const acb_t x); -void acb_get_mag_lower(mag_t z, const acb_t x); +void acb_get_mag_lower(mag_t u, const acb_t x); void acb_get_abs_ubound_arf(arf_t u, const acb_t z, slong prec); void acb_get_abs_lbound_arf(arf_t u, const acb_t z, slong prec); @@ -343,9 +343,9 @@ acb_union(acb_t res, const acb_t x, const acb_t y, slong prec) void acb_arg(arb_t r, const acb_t z, slong prec); -void acb_sgn(acb_t res, const acb_t z, slong prec); +void acb_sgn(acb_t r, const acb_t z, slong prec); -void acb_csgn(arb_t res, const acb_t z); +void acb_csgn(arb_t r, const acb_t z); void acb_real_abs(acb_t res, const acb_t z, int analytic, slong prec); void acb_real_sgn(acb_t res, const acb_t z, int analytic, slong prec); @@ -356,10 +356,10 @@ void acb_real_max(acb_t res, const acb_t x, const acb_t y, int analytic, slong p void acb_real_min(acb_t res, const acb_t x, const acb_t y, int analytic, slong prec); void acb_real_sqrtpos(acb_t res, const acb_t z, int analytic, slong prec); -void acb_sqrt_analytic(acb_t res, const acb_t z, int analytic, slong prec); -void acb_rsqrt_analytic(acb_t res, const acb_t z, int analytic, slong prec); -void acb_log_analytic(acb_t res, const acb_t z, int analytic, slong prec); -void acb_pow_analytic(acb_t res, const acb_t z, const acb_t w, int analytic, slong prec); +void acb_sqrt_analytic(acb_t r, const acb_t z, int analytic, slong prec); +void acb_rsqrt_analytic(acb_t r, const acb_t z, int analytic, slong prec); +void acb_log_analytic(acb_t r, const acb_t z, int analytic, slong prec); +void acb_pow_analytic(acb_t r, const acb_t x, const acb_t y, int analytic, slong prec); ACB_INLINE void acb_add(acb_t z, const acb_t x, const acb_t y, slong prec) @@ -655,7 +655,7 @@ acb_div_fmpz(acb_t z, const acb_t x, const fmpz_t c, slong prec) arb_div_fmpz(acb_imagref(z), acb_imagref(x), c, prec); } -void acb_cube(acb_t y, const acb_t x, slong prec); +void acb_cube(acb_t z, const acb_t x, slong prec); void acb_pow_fmpz(acb_t y, const acb_t b, const fmpz_t e, slong prec); void acb_pow_ui(acb_t y, const acb_t b, ulong e, slong prec); void acb_pow_si(acb_t y, const acb_t b, slong e, slong prec); @@ -667,26 +667,26 @@ acb_const_pi(acb_t x, slong prec) arb_zero(acb_imagref(x)); } -void acb_log(acb_t r, const acb_t z, slong prec); -void acb_log1p(acb_t r, const acb_t z, slong prec); +void acb_log(acb_t y, const acb_t z, slong prec); +void acb_log1p(acb_t z, const acb_t x, slong prec); -void acb_exp(acb_t r, const acb_t z, slong prec); -void acb_exp_pi_i(acb_t r, const acb_t z, slong prec); -void acb_exp_invexp(acb_t r, acb_t s, const acb_t z, slong prec); -void acb_expm1(acb_t r, const acb_t z, slong prec); +void acb_exp(acb_t y, const acb_t z, slong prec); +void acb_exp_pi_i(acb_t y, const acb_t z, slong prec); +void acb_exp_invexp(acb_t s, acb_t t, const acb_t z, slong prec); +void acb_expm1(acb_t res, const acb_t z, slong prec); -void acb_sin(acb_t r, const acb_t z, slong prec); -void acb_cos(acb_t r, const acb_t z, slong prec); +void acb_sin(acb_t s, const acb_t z, slong prec); +void acb_cos(acb_t c, const acb_t z, slong prec); void acb_sin_cos(acb_t s, acb_t c, const acb_t z, slong prec); -void acb_tan(acb_t r, const acb_t z, slong prec); -void acb_cot(acb_t r, const acb_t z, slong prec); +void acb_tan(acb_t s, const acb_t z, slong prec); +void acb_cot(acb_t s, const acb_t z, slong prec); -void acb_asin(acb_t r, const acb_t z, slong prec); -void acb_acos(acb_t r, const acb_t z, slong prec); -void acb_atan(acb_t r, const acb_t z, slong prec); +void acb_asin(acb_t res, const acb_t z, slong prec); +void acb_acos(acb_t res, const acb_t z, slong prec); +void acb_atan(acb_t res, const acb_t z, slong prec); void acb_asinh(acb_t r, const acb_t z, slong prec); -void acb_acosh(acb_t r, const acb_t z, slong prec); -void acb_atanh(acb_t r, const acb_t z, slong prec); +void acb_acosh(acb_t res, const acb_t z, slong prec); +void acb_atanh(acb_t res, const acb_t z, slong prec); ACB_INLINE void acb_sinh(acb_t y, const acb_t x, slong prec) @@ -727,8 +727,8 @@ acb_coth(acb_t y, const acb_t x, slong prec) acb_mul_onei(y, y); } -void acb_sech(acb_t r, const acb_t z, slong prec); -void acb_csch(acb_t r, const acb_t z, slong prec); +void acb_sech(acb_t res, const acb_t z, slong prec); +void acb_csch(acb_t res, const acb_t z, slong prec); ACB_INLINE void acb_sec(acb_t y, const acb_t x, slong prec) @@ -745,24 +745,24 @@ acb_csc(acb_t y, const acb_t x, slong prec) acb_mul_onei(y, y); } -void acb_sin_pi(acb_t r, const acb_t z, slong prec); -void acb_cos_pi(acb_t r, const acb_t z, slong prec); +void acb_sin_pi(acb_t s, const acb_t z, slong prec); +void acb_cos_pi(acb_t s, const acb_t z, slong prec); void acb_sin_cos_pi(acb_t s, acb_t c, const acb_t z, slong prec); -void acb_tan_pi(acb_t r, const acb_t z, slong prec); -void acb_cot_pi(acb_t r, const acb_t z, slong prec); -void acb_csc_pi(acb_t y, const acb_t x, slong prec); +void acb_tan_pi(acb_t s, const acb_t z, slong prec); +void acb_cot_pi(acb_t s, const acb_t z, slong prec); +void acb_csc_pi(acb_t res, const acb_t z, slong prec); -void acb_sinc(acb_t res, const acb_t z, slong prec); -void acb_sinc_pi(acb_t res, const acb_t z, slong prec); +void acb_sinc(acb_t s, const acb_t z, slong prec); +void acb_sinc_pi(acb_t s, const acb_t z, slong prec); void acb_pow_arb(acb_t z, const acb_t x, const arb_t y, slong prec); -void acb_pow(acb_t r, const acb_t x, const acb_t y, slong prec); +void acb_pow(acb_t z, const acb_t x, const acb_t y, slong prec); -void acb_sqrt(acb_t y, const acb_t x, slong prec); -void acb_rsqrt(acb_t y, const acb_t x, slong prec); +void acb_sqrt(acb_t r, const acb_t z, slong prec); +void acb_rsqrt(acb_t r, const acb_t z, slong prec); void acb_sqrts(acb_t y1, acb_t y2, const acb_t x, slong prec); -void acb_root_ui(acb_t y, const acb_t x, ulong k, slong prec); +void acb_root_ui(acb_t r, const acb_t z, ulong k, slong prec); void acb_quadratic_roots_fmpz(acb_t r1, acb_t r2, const fmpz_t a, const fmpz_t b, const fmpz_t c, slong prec); @@ -776,7 +776,7 @@ void acb_rising_ui(acb_t z, const acb_t x, ulong n, slong prec); void acb_rising(acb_t z, const acb_t x, const acb_t n, slong prec); void acb_rising2_ui(acb_t u, acb_t v, const acb_t x, ulong n, slong prec); -void acb_rising_ui_get_mag(mag_t bound, const acb_t s, ulong n); +void acb_rising_ui_get_mag(mag_t bound, const acb_t x, ulong n); void acb_gamma(acb_t y, const acb_t x, slong prec); void acb_rgamma(acb_t y, const acb_t x, slong prec); @@ -797,7 +797,7 @@ void acb_polylog_si(acb_t w, slong s, const acb_t z, slong prec); void acb_agm1(acb_t m, const acb_t z, slong prec); void acb_agm1_cpx(acb_ptr m, const acb_t z, slong len, slong prec); -void acb_agm(acb_t res, const acb_t a, const acb_t b, slong prec); +void acb_agm(acb_t m, const acb_t x, const acb_t y, slong prec); #define ACB_LAMBERTW_LEFT 2 #define ACB_LAMBERTW_MIDDLE 4 @@ -1012,11 +1012,11 @@ void acb_fprintn(FILE * fp, const acb_t z, slong digits, ulong flags); #endif void acb_print(const acb_t x); -void acb_printd(const acb_t z, slong digits); +void acb_printd(const acb_t x, slong digits); void acb_printn(const acb_t x, slong digits, ulong flags); -void _acb_vec_printd(acb_srcptr vec, slong len, slong ndigits); -void _acb_vec_printn(acb_srcptr vec, slong len, slong ndigits, ulong flags); +void _acb_vec_printd(acb_srcptr vec, slong len, slong digits); +void _acb_vec_printn(acb_srcptr vec, slong len, slong digits, ulong flags); void acb_randtest(acb_t z, flint_rand_t state, slong prec, slong mag_bits); diff --git a/src/acb_dft.h b/src/acb_dft.h index 069240b5dd..22dc1c48cc 100644 --- a/src/acb_dft.h +++ b/src/acb_dft.h @@ -20,12 +20,12 @@ extern "C" { #endif void _acb_dft_naive(acb_ptr w, acb_srcptr v, slong dv, acb_srcptr z, slong dz, slong len, slong prec); -void acb_dft_naive(acb_ptr w, acb_srcptr v, slong len, slong prec); -void acb_dft_crt(acb_ptr w, acb_srcptr v, slong len, slong prec); -void acb_dft_cyc(acb_ptr w, acb_srcptr v, slong len, slong prec); +void acb_dft_naive(acb_ptr w, acb_srcptr v, slong n, slong prec); +void acb_dft_crt(acb_ptr w, acb_srcptr v, slong n, slong prec); +void acb_dft_cyc(acb_ptr w, acb_srcptr v, slong n, slong prec); void acb_dft_rad2_inplace(acb_ptr v, int e, slong prec); void acb_dft_rad2(acb_ptr w, acb_srcptr v, int e, slong prec); -void acb_dft_bluestein(acb_ptr w, acb_srcptr v, slong len, slong prec); +void acb_dft_bluestein(acb_ptr w, acb_srcptr v, slong n, slong prec); void acb_dft_prod(acb_ptr w, acb_srcptr v, slong * cyc, slong num, slong prec); void acb_dft_rad2_inplace_threaded(acb_ptr v, int e, slong prec); @@ -176,12 +176,12 @@ void acb_dft_step(acb_ptr w, acb_srcptr v, acb_dft_step_ptr cyc, slong num, slon void acb_dft_precomp(acb_ptr w, acb_srcptr v, const acb_dft_pre_t pre, slong prec); void acb_dft_inverse_precomp(acb_ptr w, acb_srcptr v, const acb_dft_pre_t pre, slong prec); -void acb_dft_naive_precomp(acb_ptr w, acb_srcptr v, const acb_dft_naive_t pol, slong prec); -void acb_dft_cyc_precomp(acb_ptr w, acb_srcptr v, const acb_dft_cyc_t cyc, slong prec); +void acb_dft_naive_precomp(acb_ptr w, acb_srcptr v, const acb_dft_naive_t t, slong prec); +void acb_dft_cyc_precomp(acb_ptr w, acb_srcptr v, const acb_dft_cyc_t t, slong prec); void acb_dft_rad2_precomp_inplace(acb_ptr v, const acb_dft_rad2_t rad2, slong prec); -void acb_dft_rad2_precomp(acb_ptr w, acb_srcptr v, const acb_dft_rad2_t rad2, slong prec); -void acb_dft_crt_precomp(acb_ptr w, acb_srcptr v, const acb_dft_crt_t crt, slong prec); +void acb_dft_rad2_precomp(acb_ptr w, acb_srcptr v, const acb_dft_rad2_t t, slong prec); +void acb_dft_crt_precomp(acb_ptr w, acb_srcptr v, const acb_dft_crt_t t, slong prec); void acb_dft_prod_precomp(acb_ptr w, acb_srcptr v, const acb_dft_prod_t prod, slong prec); void acb_dft_bluestein_precomp(acb_ptr w, acb_srcptr v, const acb_dft_bluestein_t t, slong prec); @@ -195,8 +195,8 @@ void _acb_dft_precomp_init(acb_dft_pre_t pre, slong dv, acb_ptr z, slong dz, slo void acb_dft_precomp_init(acb_dft_pre_t pre, slong len, slong prec); void acb_dft_precomp_clear(acb_dft_pre_t pre); -void acb_dft(acb_ptr w, acb_srcptr v, slong len, slong prec); -void acb_dft_inverse(acb_ptr w, acb_srcptr v, slong len, slong prec); +void acb_dft(acb_ptr w, acb_srcptr v, slong n, slong prec); +void acb_dft_inverse(acb_ptr w, acb_srcptr v, slong n, slong prec); acb_dft_step_ptr _acb_dft_steps_prod(slong * m, slong num, slong prec); @@ -269,8 +269,8 @@ acb_dft_bluestein_clear(acb_dft_bluestein_t t) } void _acb_dft_crt_init(acb_dft_crt_t crt, slong dv, slong len, slong prec); -void acb_dft_crt_init(acb_dft_crt_t crt, slong len, slong prec); -void acb_dft_crt_clear(acb_dft_crt_t crt); +void acb_dft_crt_init(acb_dft_crt_t t, slong len, slong prec); +void acb_dft_crt_clear(acb_dft_crt_t t); /* utils, could be moved elsewhere */ diff --git a/src/acb_dirichlet.h b/src/acb_dirichlet.h index d1ba95c046..d18246825a 100644 --- a/src/acb_dirichlet.h +++ b/src/acb_dirichlet.h @@ -24,12 +24,12 @@ extern "C" { void acb_dirichlet_powsum_term(acb_ptr res, arb_t log_prev, ulong * prev, const acb_t s, ulong k, int integer, int critical_line, slong len, slong prec); -void acb_dirichlet_powsum_sieved(acb_ptr z, const acb_t s, ulong n, slong len, slong prec); -void acb_dirichlet_powsum_smooth(acb_ptr z, const acb_t s, ulong n, slong len, slong prec); +void acb_dirichlet_powsum_sieved(acb_ptr res, const acb_t s, ulong n, slong len, slong prec); +void acb_dirichlet_powsum_smooth(acb_ptr res, const acb_t s, ulong n, slong len, slong prec); void acb_dirichlet_zeta_bound(mag_t res, const acb_t s); void acb_dirichlet_zeta_deriv_bound(mag_t der1, mag_t der2, const acb_t s); -void acb_dirichlet_zeta_rs_f_coeffs(acb_ptr c, const arb_t p, slong N, slong prec); +void acb_dirichlet_zeta_rs_f_coeffs(acb_ptr f, const arb_t p, slong n, slong prec); void acb_dirichlet_zeta_rs_d_coeffs(arb_ptr d, const arb_t sigma, slong k, slong prec); void acb_dirichlet_zeta_rs_bound(mag_t err, const acb_t s, slong K); void acb_dirichlet_zeta_rs_r(acb_t res, const acb_t s, slong K, slong prec); @@ -93,9 +93,9 @@ acb_dirichlet_roots_struct; typedef acb_dirichlet_roots_struct acb_dirichlet_roots_t[1]; -void acb_dirichlet_roots_init(acb_dirichlet_roots_t t, ulong order, slong num, slong prec); -void acb_dirichlet_roots_clear(acb_dirichlet_roots_t t); -void acb_dirichlet_root(acb_t z, const acb_dirichlet_roots_t t, ulong n, slong prec); +void acb_dirichlet_roots_init(acb_dirichlet_roots_t roots, ulong n, slong num, slong prec); +void acb_dirichlet_roots_clear(acb_dirichlet_roots_t roots); +void acb_dirichlet_root(acb_t res, const acb_dirichlet_roots_t roots, ulong k, slong prec); void acb_dirichlet_chi(acb_t res, const dirichlet_group_t G, const dirichlet_char_t chi, ulong n, slong prec); void acb_dirichlet_chi_vec(acb_ptr v, const dirichlet_group_t G, const dirichlet_char_t chi, slong nv, slong prec); @@ -106,7 +106,7 @@ void acb_dirichlet_qseries_arb_powers_naive(acb_t res, const arb_t x, int parity void acb_dirichlet_qseries_arb_powers_smallorder(acb_t res, const arb_t x, int parity, const ulong *a, const acb_dirichlet_roots_t z, slong len, slong prec); ulong acb_dirichlet_theta_length_d(ulong q, double x, slong prec); -ulong acb_dirichlet_theta_length(ulong q, const arb_t x, slong prec); +ulong acb_dirichlet_theta_length(ulong q, const arb_t t, slong prec); void mag_tail_kexpk2_arb(mag_t res, const arb_t a, ulong n); void _acb_dirichlet_theta_argument_at_arb(arb_t xt, ulong q, const arb_t t, slong prec); @@ -161,10 +161,10 @@ void acb_dirichlet_hardy_z(acb_ptr res, const acb_t t, const dirichlet_group_t G, const dirichlet_char_t chi, slong len, slong prec); -void _acb_dirichlet_hardy_theta_series(acb_ptr res, acb_srcptr s, slong slen, const dirichlet_group_t G, const dirichlet_char_t chi, slong len, slong prec); -void acb_dirichlet_hardy_theta_series(acb_poly_t res, const acb_poly_t s, const dirichlet_group_t G, const dirichlet_char_t chi, slong len, slong prec); -void _acb_dirichlet_hardy_z_series(acb_ptr res, acb_srcptr s, slong slen, const dirichlet_group_t G, const dirichlet_char_t chi, slong len, slong prec); -void acb_dirichlet_hardy_z_series(acb_poly_t res, const acb_poly_t s, const dirichlet_group_t G, const dirichlet_char_t chi, slong len, slong prec); +void _acb_dirichlet_hardy_theta_series(acb_ptr res, acb_srcptr t, slong tlen, const dirichlet_group_t G, const dirichlet_char_t chi, slong len, slong prec); +void acb_dirichlet_hardy_theta_series(acb_poly_t res, const acb_poly_t t, const dirichlet_group_t G, const dirichlet_char_t chi, slong len, slong prec); +void _acb_dirichlet_hardy_z_series(acb_ptr res, acb_srcptr t, slong tlen, const dirichlet_group_t G, const dirichlet_char_t chi, slong len, slong prec); +void acb_dirichlet_hardy_z_series(acb_poly_t res, const acb_poly_t t, const dirichlet_group_t G, const dirichlet_char_t chi, slong len, slong prec); void acb_dirichlet_gram_point(arb_t res, const fmpz_t n, const dirichlet_group_t G, const dirichlet_char_t chi, slong prec); ulong acb_dirichlet_turing_method_bound(const fmpz_t p); diff --git a/src/acb_elliptic.h b/src/acb_elliptic.h index 2c533f1727..a63155490c 100644 --- a/src/acb_elliptic.h +++ b/src/acb_elliptic.h @@ -18,11 +18,11 @@ extern "C" { #endif -void acb_elliptic_k(acb_t k, const acb_t m, slong prec); +void acb_elliptic_k(acb_t res, const acb_t m, slong prec); -void acb_elliptic_k_jet(acb_ptr w, const acb_t m, slong len, slong prec); +void acb_elliptic_k_jet(acb_ptr res, const acb_t m, slong len, slong prec); -void _acb_elliptic_k_series(acb_ptr res, acb_srcptr m, slong zlen, slong len, slong prec); +void _acb_elliptic_k_series(acb_ptr res, acb_srcptr m, slong mlen, slong len, slong prec); void acb_elliptic_k_series(acb_poly_t res, const acb_poly_t m, slong len, slong prec); @@ -38,19 +38,19 @@ void acb_elliptic_rg(acb_t res, const acb_t x, const acb_t y, const acb_t z, int void acb_elliptic_rc1(acb_t res, const acb_t x, slong prec); -void acb_elliptic_f(acb_t res, const acb_t phi, const acb_t m, int times_pi, slong prec); +void acb_elliptic_f(acb_t res, const acb_t phi, const acb_t m, int pi, slong prec); -void acb_elliptic_e_inc(acb_t res, const acb_t phi, const acb_t m, int times_pi, slong prec); +void acb_elliptic_e_inc(acb_t res, const acb_t phi, const acb_t m, int pi, slong prec); -void acb_elliptic_pi(acb_t r, const acb_t n, const acb_t m, slong prec); +void acb_elliptic_pi(acb_t res, const acb_t n, const acb_t m, slong prec); -void acb_elliptic_pi_inc(acb_t res, const acb_t n, const acb_t phi, const acb_t m, int times_pi, slong prec); +void acb_elliptic_pi_inc(acb_t res, const acb_t n, const acb_t phi, const acb_t m, int pi, slong prec); -void acb_elliptic_p(acb_t r, const acb_t z, const acb_t tau, slong prec); +void acb_elliptic_p(acb_t res, const acb_t z, const acb_t tau, slong prec); -void acb_elliptic_p_prime(acb_t r, const acb_t z, const acb_t tau, slong prec); +void acb_elliptic_p_prime(acb_t res, const acb_t z, const acb_t tau, slong prec); -void acb_elliptic_p_jet(acb_ptr r, const acb_t z, const acb_t tau, slong len, slong prec); +void acb_elliptic_p_jet(acb_ptr res, const acb_t z, const acb_t tau, slong len, slong prec); void _acb_elliptic_p_series(acb_ptr res, acb_srcptr z, slong zlen, const acb_t tau, slong len, slong prec); diff --git a/src/acb_hypgeom.h b/src/acb_hypgeom.h index d87595842b..381ce852f6 100644 --- a/src/acb_hypgeom.h +++ b/src/acb_hypgeom.h @@ -22,25 +22,25 @@ void acb_hypgeom_rising_ui_forward(acb_t res, const acb_t x, ulong n, slong prec void acb_hypgeom_rising_ui_rs(acb_t res, const acb_t x, ulong n, ulong m, slong prec); void acb_hypgeom_rising_ui_bs(acb_t res, const acb_t x, ulong n, slong prec); void acb_hypgeom_rising_ui_rec(acb_t res, const acb_t x, ulong n, slong prec); -void acb_hypgeom_rising_ui(acb_t y, const acb_t x, ulong n, slong prec); -void acb_hypgeom_rising(acb_t y, const acb_t x, const acb_t n, slong prec); +void acb_hypgeom_rising_ui(acb_t res, const acb_t x, ulong n, slong prec); +void acb_hypgeom_rising(acb_t res, const acb_t x, const acb_t n, slong prec); void acb_hypgeom_rising_ui_jet_powsum(acb_ptr res, const acb_t x, ulong n, slong len, slong prec); void acb_hypgeom_rising_ui_jet_rs(acb_ptr res, const acb_t x, ulong n, ulong m, slong len, slong prec); void acb_hypgeom_rising_ui_jet_bs(acb_ptr res, const acb_t x, ulong n, slong len, slong prec); void acb_hypgeom_rising_ui_jet(acb_ptr res, const acb_t x, ulong n, slong len, slong prec); -void acb_hypgeom_log_rising_ui_jet(acb_ptr res, const acb_t z, ulong r, slong len, slong prec); -void acb_hypgeom_log_rising_ui(acb_ptr res, const acb_t z, ulong r, slong prec); +void acb_hypgeom_log_rising_ui_jet(acb_ptr res, const acb_t x, ulong n, slong len, slong prec); +void acb_hypgeom_log_rising_ui(acb_ptr res, const acb_t x, ulong n, slong prec); void acb_hypgeom_gamma_stirling_sum_horner(acb_t s, const acb_t z, slong N, slong prec); void acb_hypgeom_gamma_stirling_sum_improved(acb_t s, const acb_t z, slong N, slong K, slong prec); void acb_hypgeom_gamma_stirling(acb_t res, const acb_t x, int reciprocal, slong prec); int acb_hypgeom_gamma_taylor(acb_t res, const acb_t x, int reciprocal, slong prec); -void acb_hypgeom_gamma(acb_t y, const acb_t x, slong prec); -void acb_hypgeom_rgamma(acb_t y, const acb_t x, slong prec); +void acb_hypgeom_gamma(acb_t res, const acb_t x, slong prec); +void acb_hypgeom_rgamma(acb_t res, const acb_t x, slong prec); -void acb_hypgeom_lgamma(acb_t y, const acb_t x, slong prec); +void acb_hypgeom_lgamma(acb_t res, const acb_t x, slong prec); void acb_hypgeom_pfq_bound_factor(mag_t C, acb_srcptr a, slong p, acb_srcptr b, slong q, const acb_t z, ulong n); @@ -140,7 +140,7 @@ void acb_hypgeom_bessel_i(acb_t res, const acb_t nu, const acb_t z, slong prec); void acb_hypgeom_bessel_i_scaled(acb_t res, const acb_t nu, const acb_t z, slong prec); void acb_hypgeom_bessel_k_0f1(acb_t res, const acb_t nu, const acb_t z, int scaled, slong prec); -void acb_hypgeom_bessel_k_0f1_series(acb_poly_t res, const acb_poly_t n, const acb_poly_t z, int scaled, slong len, slong prec); +void acb_hypgeom_bessel_k_0f1_series(acb_poly_t res, const acb_poly_t nu, const acb_poly_t z, int scaled, slong len, slong prec); void acb_hypgeom_bessel_k_asymp(acb_t res, const acb_t nu, const acb_t z, int scaled, slong prec); void acb_hypgeom_bessel_k(acb_t res, const acb_t nu, const acb_t z, slong prec); void acb_hypgeom_bessel_k_scaled(acb_t res, const acb_t nu, const acb_t z, slong prec); @@ -152,10 +152,10 @@ void acb_hypgeom_0f1_asymp(acb_t res, const acb_t a, const acb_t z, int regulari void acb_hypgeom_0f1_direct(acb_t res, const acb_t a, const acb_t z, int regularized, slong prec); void acb_hypgeom_0f1(acb_t res, const acb_t a, const acb_t z, int regularized, slong prec); -void acb_hypgeom_airy_bound(mag_t ai, mag_t aip, mag_t bi, mag_t bip, const acb_t z); -void acb_hypgeom_airy_asymp(acb_t ai, acb_t aip, acb_t bi, acb_t bip, const acb_t z, slong n, slong prec); -void acb_hypgeom_airy_direct(acb_t ai, acb_t aip, acb_t bi, acb_t bip, const acb_t z, slong n, slong prec); -void acb_hypgeom_airy(acb_t ai, acb_t aip, acb_t bi, acb_t bip, const acb_t z, slong prec); +void acb_hypgeom_airy_bound(mag_t ai, mag_t ai_prime, mag_t bi, mag_t bi_prime, const acb_t z); +void acb_hypgeom_airy_asymp(acb_t ai, acb_t ai_prime, acb_t bi, acb_t bi_prime, const acb_t z, slong n, slong prec); +void acb_hypgeom_airy_direct(acb_t ai, acb_t ai_prime, acb_t bi, acb_t bi_prime, const acb_t z, slong n, slong prec); +void acb_hypgeom_airy(acb_t ai, acb_t ai_prime, acb_t bi, acb_t bi_prime, const acb_t z, slong prec); void acb_hypgeom_airy_jet(acb_ptr ai, acb_ptr bi, const acb_t z, slong len, slong prec); void _acb_hypgeom_airy_series(acb_ptr ai, acb_ptr ai_prime, acb_ptr bi, acb_ptr bi_prime, acb_srcptr z, slong zlen, slong len, slong prec); void acb_hypgeom_airy_series(acb_poly_t ai, acb_poly_t ai_prime, acb_poly_t bi, acb_poly_t bi_prime, const acb_poly_t z, slong len, slong prec); @@ -165,23 +165,23 @@ void acb_hypgeom_coulomb_jet(acb_ptr F, acb_ptr G, acb_ptr Hpos, acb_ptr Hneg, c void _acb_hypgeom_coulomb_series(acb_ptr F, acb_ptr G, acb_ptr Hpos, acb_ptr Hneg, const acb_t l, const acb_t eta, acb_srcptr z, slong zlen, slong len, slong prec); void acb_hypgeom_coulomb_series(acb_poly_t F, acb_poly_t G, acb_poly_t Hpos, acb_poly_t Hneg, const acb_t l, const acb_t eta, const acb_poly_t z, slong len, slong prec); -void acb_hypgeom_gamma_upper_asymp(acb_t res, const acb_t s, const acb_t z, int modified, slong prec); -void acb_hypgeom_gamma_upper_1f1a(acb_t res, const acb_t s, const acb_t z, int modified, slong prec); -void acb_hypgeom_gamma_upper_1f1b(acb_t res, const acb_t s, const acb_t z, int modified, slong prec); -void acb_hypgeom_gamma_upper_singular(acb_t res, slong s, const acb_t z, int modified, slong prec); -void acb_hypgeom_gamma_upper(acb_t res, const acb_t s, const acb_t z, int modified, slong prec); +void acb_hypgeom_gamma_upper_asymp(acb_t res, const acb_t s, const acb_t z, int regularized, slong prec); +void acb_hypgeom_gamma_upper_1f1a(acb_t res, const acb_t s, const acb_t z, int regularized, slong prec); +void acb_hypgeom_gamma_upper_1f1b(acb_t res, const acb_t s, const acb_t z, int regularized, slong prec); +void acb_hypgeom_gamma_upper_singular(acb_t res, slong s, const acb_t z, int regularized, slong prec); +void acb_hypgeom_gamma_upper(acb_t res, const acb_t s, const acb_t z, int regularized, slong prec); -void _acb_hypgeom_gamma_upper_series(acb_ptr g, const acb_t s, acb_srcptr h, slong hlen, int regularized, slong n, slong prec); -void acb_hypgeom_gamma_upper_series(acb_poly_t g, const acb_t s, const acb_poly_t h, int regularized, slong n, slong prec); +void _acb_hypgeom_gamma_upper_series(acb_ptr res, const acb_t s, acb_srcptr z, slong zlen, int regularized, slong n, slong prec); +void acb_hypgeom_gamma_upper_series(acb_poly_t res, const acb_t s, const acb_poly_t z, int regularized, slong n, slong prec); -void acb_hypgeom_gamma_lower(acb_t res, const acb_t s, const acb_t z, int modified, slong prec); +void acb_hypgeom_gamma_lower(acb_t res, const acb_t s, const acb_t z, int regularized, slong prec); -void _acb_hypgeom_gamma_lower_series(acb_ptr g, const acb_t s, acb_srcptr h, slong hlen, int regularized, slong n, slong prec); -void acb_hypgeom_gamma_lower_series(acb_poly_t g, const acb_t s, const acb_poly_t h, int regularized, slong n, slong prec); +void _acb_hypgeom_gamma_lower_series(acb_ptr res, const acb_t s, acb_srcptr z, slong zlen, int regularized, slong n, slong prec); +void acb_hypgeom_gamma_lower_series(acb_poly_t res, const acb_t s, const acb_poly_t z, int regularized, slong n, slong prec); void acb_hypgeom_beta_lower(acb_t res, const acb_t a, const acb_t b, const acb_t z, int regularized, slong prec); -void _acb_hypgeom_beta_lower_series(acb_ptr res, const acb_t a, const acb_t b, acb_srcptr z, slong zlen, int regularized, slong len, slong prec); -void acb_hypgeom_beta_lower_series(acb_poly_t res, const acb_t a, const acb_t b, const acb_poly_t z, int regularized, slong len, slong prec); +void _acb_hypgeom_beta_lower_series(acb_ptr res, const acb_t a, const acb_t b, acb_srcptr z, slong zlen, int regularized, slong n, slong prec); +void acb_hypgeom_beta_lower_series(acb_poly_t res, const acb_t a, const acb_t b, const acb_poly_t z, int regularized, slong n, slong prec); void acb_hypgeom_expint(acb_t res, const acb_t s, const acb_t z, slong prec); @@ -190,52 +190,52 @@ void acb_hypgeom_erf_1f1a(acb_t res, const acb_t z, slong prec); void acb_hypgeom_erf_1f1b(acb_t res, const acb_t z, slong prec); void acb_hypgeom_erf_asymp(acb_t res, const acb_t z, int complementary, slong prec, slong prec2); void acb_hypgeom_erf(acb_t res, const acb_t z, slong prec); -void _acb_hypgeom_erf_series(acb_ptr g, acb_srcptr h, slong hlen, slong len, slong prec); -void acb_hypgeom_erf_series(acb_poly_t g, const acb_poly_t h, slong len, slong prec); +void _acb_hypgeom_erf_series(acb_ptr res, acb_srcptr z, slong zlen, slong len, slong prec); +void acb_hypgeom_erf_series(acb_poly_t res, const acb_poly_t z, slong len, slong prec); void acb_hypgeom_erfc(acb_t res, const acb_t z, slong prec); -void _acb_hypgeom_erfc_series(acb_ptr g, acb_srcptr h, slong hlen, slong len, slong prec); -void acb_hypgeom_erfc_series(acb_poly_t g, const acb_poly_t h, slong len, slong prec); +void _acb_hypgeom_erfc_series(acb_ptr res, acb_srcptr z, slong zlen, slong len, slong prec); +void acb_hypgeom_erfc_series(acb_poly_t res, const acb_poly_t z, slong len, slong prec); void acb_hypgeom_erfi(acb_t res, const acb_t z, slong prec); -void _acb_hypgeom_erfi_series(acb_ptr g, acb_srcptr h, slong hlen, slong len, slong prec); -void acb_hypgeom_erfi_series(acb_poly_t g, const acb_poly_t h, slong len, slong prec); +void _acb_hypgeom_erfi_series(acb_ptr res, acb_srcptr z, slong zlen, slong len, slong prec); +void acb_hypgeom_erfi_series(acb_poly_t res, const acb_poly_t z, slong len, slong prec); void acb_hypgeom_fresnel(acb_t res1, acb_t res2, const acb_t z, int normalized, slong prec); -void _acb_hypgeom_fresnel_series(acb_ptr s, acb_ptr c, acb_srcptr h, slong hlen, int normalized, slong len, slong prec); -void acb_hypgeom_fresnel_series(acb_poly_t s, acb_poly_t c, const acb_poly_t h, int normalized, slong len, slong prec); +void _acb_hypgeom_fresnel_series(acb_ptr res1, acb_ptr res2, acb_srcptr z, slong zlen, int normalized, slong len, slong prec); +void acb_hypgeom_fresnel_series(acb_poly_t res1, acb_poly_t res2, const acb_poly_t z, int normalized, slong len, slong prec); void acb_hypgeom_ei_asymp(acb_t res, const acb_t z, slong prec); void acb_hypgeom_ei_2f2(acb_t res, const acb_t z, slong prec); void acb_hypgeom_ei(acb_t res, const acb_t z, slong prec); -void _acb_hypgeom_ei_series(acb_ptr g, acb_srcptr h, slong hlen, slong len, slong prec); -void acb_hypgeom_ei_series(acb_poly_t g, const acb_poly_t h, slong len, slong prec); +void _acb_hypgeom_ei_series(acb_ptr res, acb_srcptr z, slong zlen, slong len, slong prec); +void acb_hypgeom_ei_series(acb_poly_t res, const acb_poly_t z, slong len, slong prec); void acb_hypgeom_si_asymp(acb_t res, const acb_t z, slong prec); void acb_hypgeom_si_1f2(acb_t res, const acb_t z, slong prec); void acb_hypgeom_si(acb_t res, const acb_t z, slong prec); -void _acb_hypgeom_si_series(acb_ptr g, acb_srcptr h, slong hlen, slong len, slong prec); -void acb_hypgeom_si_series(acb_poly_t g, const acb_poly_t h, slong len, slong prec); +void _acb_hypgeom_si_series(acb_ptr res, acb_srcptr z, slong zlen, slong len, slong prec); +void acb_hypgeom_si_series(acb_poly_t res, const acb_poly_t z, slong len, slong prec); void acb_hypgeom_ci_asymp(acb_t res, const acb_t z, slong prec); void acb_hypgeom_ci_2f3(acb_t res, const acb_t z, slong prec); void acb_hypgeom_ci(acb_t res, const acb_t z, slong prec); -void _acb_hypgeom_ci_series(acb_ptr g, acb_srcptr h, slong hlen, slong len, slong prec); -void acb_hypgeom_ci_series(acb_poly_t g, const acb_poly_t h, slong len, slong prec); +void _acb_hypgeom_ci_series(acb_ptr res, acb_srcptr z, slong zlen, slong len, slong prec); +void acb_hypgeom_ci_series(acb_poly_t res, const acb_poly_t z, slong len, slong prec); void acb_hypgeom_shi(acb_t res, const acb_t z, slong prec); -void _acb_hypgeom_shi_series(acb_ptr g, acb_srcptr h, slong hlen, slong len, slong prec); -void acb_hypgeom_shi_series(acb_poly_t g, const acb_poly_t h, slong len, slong prec); +void _acb_hypgeom_shi_series(acb_ptr res, acb_srcptr z, slong zlen, slong len, slong prec); +void acb_hypgeom_shi_series(acb_poly_t res, const acb_poly_t z, slong len, slong prec); void acb_hypgeom_chi_asymp(acb_t res, const acb_t z, slong prec); void acb_hypgeom_chi_2f3(acb_t res, const acb_t z, slong prec); void acb_hypgeom_chi(acb_t res, const acb_t z, slong prec); -void _acb_hypgeom_chi_series(acb_ptr g, acb_srcptr h, slong hlen, slong len, slong prec); -void acb_hypgeom_chi_series(acb_poly_t g, const acb_poly_t h, slong len, slong prec); +void _acb_hypgeom_chi_series(acb_ptr res, acb_srcptr z, slong zlen, slong len, slong prec); +void acb_hypgeom_chi_series(acb_poly_t res, const acb_poly_t z, slong len, slong prec); void acb_hypgeom_li(acb_t res, const acb_t z, int offset, slong prec); -void _acb_hypgeom_li_series(acb_ptr g, acb_srcptr h, slong hlen, int offset, slong len, slong prec); -void acb_hypgeom_li_series(acb_poly_t g, const acb_poly_t h, int offset, slong len, slong prec); +void _acb_hypgeom_li_series(acb_ptr res, acb_srcptr z, slong zlen, int offset, slong len, slong prec); +void acb_hypgeom_li_series(acb_poly_t res, const acb_poly_t z, int offset, slong len, slong prec); void acb_hypgeom_2f1_continuation(acb_t res0, acb_t res1, const acb_t a, const acb_t b, const acb_t c, const acb_t z0, @@ -255,7 +255,7 @@ void acb_hypgeom_2f1_corner(acb_t res, const acb_t a, const acb_t b, const acb_t int acb_hypgeom_2f1_choose(const acb_t z); -void acb_hypgeom_2f1(acb_t res, const acb_t a, const acb_t b, const acb_t c, const acb_t z, int regularized, slong prec); +void acb_hypgeom_2f1(acb_t res, const acb_t a, const acb_t b, const acb_t c, const acb_t z, int flags, slong prec); #define ACB_HYPGEOM_2F1_REGULARIZED 1 #define ACB_HYPGEOM_2F1_AB 2 /* a-b integer */ diff --git a/src/acb_mat.h b/src/acb_mat.h index 0a880ee52a..a02d160df4 100644 --- a/src/acb_mat.h +++ b/src/acb_mat.h @@ -92,7 +92,7 @@ void acb_mat_set_real_imag(acb_mat_t mat, const arb_mat_t re, const arb_mat_t im void acb_mat_randtest(acb_mat_t mat, flint_rand_t state, slong prec, slong mag_bits); -void acb_mat_randtest_eig(acb_mat_t A, flint_rand_t state, acb_srcptr E, slong prec); +void acb_mat_randtest_eig(acb_mat_t mat, flint_rand_t state, acb_srcptr E, slong prec); /* I/O */ @@ -184,11 +184,11 @@ void acb_mat_onei(acb_mat_t mat); void acb_mat_indeterminate(acb_mat_t mat); -void acb_mat_dft(acb_mat_t res, int kind, slong prec); +void acb_mat_dft(acb_mat_t mat, int type, slong prec); -void acb_mat_transpose(acb_mat_t mat1, const acb_mat_t mat2); +void acb_mat_transpose(acb_mat_t dest, const acb_mat_t src); -void acb_mat_conjugate(acb_mat_t mat1, const acb_mat_t mat2); +void acb_mat_conjugate(acb_mat_t dest, const acb_mat_t src); ACB_MAT_INLINE void acb_mat_conjugate_transpose(acb_mat_t mat1, const acb_mat_t mat2) @@ -203,7 +203,7 @@ void acb_mat_bound_inf_norm(mag_t b, const acb_mat_t A); void acb_mat_frobenius_norm(arb_t res, const acb_mat_t A, slong prec); -void acb_mat_bound_frobenius_norm(mag_t b, const acb_mat_t A); +void acb_mat_bound_frobenius_norm(mag_t res, const acb_mat_t A); /* Arithmetic */ @@ -223,7 +223,7 @@ void acb_mat_mul_entrywise(acb_mat_t res, const acb_mat_t mat1, const acb_mat_t void acb_mat_sqr_classical(acb_mat_t res, const acb_mat_t mat, slong prec); void acb_mat_sqr(acb_mat_t res, const acb_mat_t mat, slong prec); -void acb_mat_pow_ui(acb_mat_t B, const acb_mat_t A, ulong exp, slong prec); +void acb_mat_pow_ui(acb_mat_t res, const acb_mat_t mat, ulong exp, slong prec); /* Scalar arithmetic */ @@ -405,7 +405,7 @@ int acb_mat_solve(acb_mat_t X, const acb_mat_t A, const acb_mat_t B, slong prec) int acb_mat_solve_precond(acb_mat_t X, const acb_mat_t A, const acb_mat_t B, slong prec); -void acb_mat_approx_mul(acb_mat_t C, const acb_mat_t A, const acb_mat_t B, slong prec); +void acb_mat_approx_mul(acb_mat_t res, const acb_mat_t mat1, const acb_mat_t mat2, slong prec); void acb_mat_approx_solve_triu(acb_mat_t X, const acb_mat_t U, const acb_mat_t B, int unit, slong prec); void acb_mat_approx_solve_tril(acb_mat_t X, const acb_mat_t L, const acb_mat_t B, int unit, slong prec); int acb_mat_approx_lu(slong * P, acb_mat_t LU, const acb_mat_t A, slong prec); @@ -451,8 +451,8 @@ void acb_mat_companion(acb_mat_t mat, const acb_poly_t poly, slong prec); void acb_mat_trace(acb_t trace, const acb_mat_t mat, slong prec); -void _acb_mat_diag_prod(acb_t res, const acb_mat_t A, slong a, slong b, slong prec); -void acb_mat_diag_prod(acb_t res, const acb_mat_t A, slong prec); +void _acb_mat_diag_prod(acb_t res, const acb_mat_t mat, slong a, slong b, slong prec); +void acb_mat_diag_prod(acb_t res, const acb_mat_t mat, slong prec); ACB_MAT_INLINE slong acb_mat_allocated_bytes(const acb_mat_t x) diff --git a/src/acb_modular.h b/src/acb_modular.h index 52b676dd41..03ef4ad211 100644 --- a/src/acb_modular.h +++ b/src/acb_modular.h @@ -162,13 +162,13 @@ void acb_modular_theta_series(acb_poly_t theta1, acb_poly_t theta2, acb_poly_t theta3, acb_poly_t theta4, const acb_poly_t z, const acb_t tau, slong len, slong prec); -void acb_modular_j(acb_t z, const acb_t tau, slong prec); +void acb_modular_j(acb_t r, const acb_t tau, slong prec); int acb_modular_epsilon_arg(const psl2z_t g); void acb_modular_eta_sum(acb_t eta, const acb_t q, slong prec); -void acb_modular_eta(acb_t z, const acb_t tau, slong prec); +void acb_modular_eta(acb_t r, const acb_t tau, slong prec); void acb_modular_lambda(acb_t r, const acb_t tau, slong prec); @@ -176,15 +176,15 @@ void acb_modular_delta(acb_t r, const acb_t tau, slong prec); void acb_modular_eisenstein(acb_ptr r, const acb_t tau, slong len, slong prec); -void acb_modular_elliptic_p(acb_t r, const acb_t z, const acb_t tau, slong prec); +void acb_modular_elliptic_p(acb_t wp, const acb_t z, const acb_t tau, slong prec); -void acb_modular_elliptic_p_zpx(acb_ptr r, const acb_t z, const acb_t tau, slong len, slong prec); +void acb_modular_elliptic_p_zpx(acb_ptr wp, const acb_t z, const acb_t tau, slong len, slong prec); -void acb_modular_elliptic_k(acb_t k, const acb_t m, slong prec); +void acb_modular_elliptic_k(acb_t w, const acb_t m, slong prec); void acb_modular_elliptic_k_cpx(acb_ptr w, const acb_t m, slong len, slong prec); -void acb_modular_elliptic_e(acb_t res, const acb_t m, slong prec); +void acb_modular_elliptic_e(acb_t w, const acb_t m, slong prec); void acb_modular_hilbert_class_poly(fmpz_poly_t res, slong D); diff --git a/src/acb_poly.h b/src/acb_poly.h index 5cafd3f05b..c7d421c97b 100644 --- a/src/acb_poly.h +++ b/src/acb_poly.h @@ -89,11 +89,11 @@ acb_poly_one(acb_poly_t poly) _acb_poly_set_length(poly, 1); } -void acb_poly_set_coeff_si(acb_poly_t poly, slong n, slong x); +void acb_poly_set_coeff_si(acb_poly_t poly, slong n, slong c); -void acb_poly_set_coeff_acb(acb_poly_t poly, slong n, const acb_t x); +void acb_poly_set_coeff_acb(acb_poly_t poly, slong n, const acb_t c); -void acb_poly_get_coeff_acb(acb_t x, const acb_poly_t poly, slong n); +void acb_poly_get_coeff_acb(acb_t v, const acb_poly_t poly, slong n); #define acb_poly_get_coeff_ptr(poly, n) \ ((n) < (poly)->length ? (poly)->coeffs + (n) : NULL) @@ -119,7 +119,7 @@ acb_poly_truncate(acb_poly_t poly, slong newlen) } } -void _acb_poly_majorant(arb_ptr res, acb_srcptr vec, slong len, slong prec); +void _acb_poly_majorant(arb_ptr res, acb_srcptr poly, slong len, slong prec); void acb_poly_majorant(arb_poly_t res, const acb_poly_t poly, slong prec); @@ -129,14 +129,14 @@ void acb_poly_fprintd(FILE * file, const acb_poly_t poly, slong digits); void acb_poly_printd(const acb_poly_t poly, slong digits); -void _acb_poly_evaluate_horner(acb_t res, acb_srcptr f, slong len, const acb_t a, slong prec); -void acb_poly_evaluate_horner(acb_t res, const acb_poly_t f, const acb_t a, slong prec); +void _acb_poly_evaluate_horner(acb_t y, acb_srcptr f, slong len, const acb_t x, slong prec); +void acb_poly_evaluate_horner(acb_t y, const acb_poly_t f, const acb_t x, slong prec); -void _acb_poly_evaluate_rectangular(acb_t y, acb_srcptr poly, slong len, const acb_t x, slong prec); -void acb_poly_evaluate_rectangular(acb_t res, const acb_poly_t f, const acb_t a, slong prec); +void _acb_poly_evaluate_rectangular(acb_t y, acb_srcptr f, slong len, const acb_t x, slong prec); +void acb_poly_evaluate_rectangular(acb_t y, const acb_poly_t f, const acb_t x, slong prec); -void _acb_poly_evaluate(acb_t res, acb_srcptr f, slong len, const acb_t a, slong prec); -void acb_poly_evaluate(acb_t res, const acb_poly_t f, const acb_t a, slong prec); +void _acb_poly_evaluate(acb_t y, acb_srcptr f, slong len, const acb_t x, slong prec); +void acb_poly_evaluate(acb_t y, const acb_poly_t f, const acb_t x, slong prec); void _acb_poly_evaluate2_horner(acb_t y, acb_t z, acb_srcptr f, slong len, const acb_t x, slong prec); void acb_poly_evaluate2_horner(acb_t y, acb_t z, const acb_poly_t f, const acb_t x, slong prec); @@ -191,9 +191,9 @@ void acb_poly_set(acb_poly_t dest, const acb_poly_t src); void acb_poly_set_round(acb_poly_t dest, const acb_poly_t src, slong prec); -void acb_poly_set_trunc(acb_poly_t res, const acb_poly_t poly, slong n); +void acb_poly_set_trunc(acb_poly_t dest, const acb_poly_t src, slong n); -void acb_poly_set_trunc_round(acb_poly_t res, const acb_poly_t poly, slong n, slong prec); +void acb_poly_set_trunc_round(acb_poly_t dest, const acb_poly_t src, slong n, slong prec); void acb_poly_set_arb_poly(acb_poly_t poly, const arb_poly_t re); @@ -203,11 +203,11 @@ void acb_poly_set_fmpq_poly(acb_poly_t poly, const fmpq_poly_t re, slong prec); void acb_poly_set2_fmpq_poly(acb_poly_t poly, const fmpq_poly_t re, const fmpq_poly_t im, slong prec); -void acb_poly_set_fmpz_poly(acb_poly_t poly, const fmpz_poly_t src, slong prec); +void acb_poly_set_fmpz_poly(acb_poly_t poly, const fmpz_poly_t re, slong prec); void acb_poly_set2_fmpz_poly(acb_poly_t poly, const fmpz_poly_t re, const fmpz_poly_t im, slong prec); -int acb_poly_get_unique_fmpz_poly(fmpz_poly_t res, const acb_poly_t src); +int acb_poly_get_unique_fmpz_poly(fmpz_poly_t z, const acb_poly_t x); ACB_POLY_INLINE void acb_poly_set_acb(acb_poly_t poly, const acb_t c) @@ -217,7 +217,7 @@ acb_poly_set_acb(acb_poly_t poly, const acb_t c) _acb_poly_set_length(poly, !acb_is_zero(poly->coeffs)); } -void acb_poly_set_si(acb_poly_t poly, slong c); +void acb_poly_set_si(acb_poly_t poly, slong src); void acb_poly_randtest(acb_poly_t poly, flint_rand_t state, slong len, slong prec, slong mag_bits); @@ -246,7 +246,7 @@ void _acb_poly_add(acb_ptr res, acb_srcptr poly1, slong len1, void acb_poly_add(acb_poly_t res, const acb_poly_t poly1, const acb_poly_t poly2, slong prec); -void acb_poly_add_si(acb_poly_t res, const acb_poly_t poly, slong c, slong prec); +void acb_poly_add_si(acb_poly_t C, const acb_poly_t A, slong B, slong prec); void _acb_poly_sub(acb_ptr res, acb_srcptr poly1, slong len1, acb_srcptr poly2, slong len2, slong prec); @@ -373,7 +373,7 @@ void _acb_poly_div_root(acb_ptr Q, acb_t R, acb_srcptr A, /* Composition */ -void _acb_poly_taylor_shift(acb_ptr poly, const acb_t c, slong n, slong prec); +void _acb_poly_taylor_shift(acb_ptr g, const acb_t c, slong n, slong prec); void acb_poly_taylor_shift(acb_poly_t g, const acb_poly_t f, const acb_t c, slong prec); void _acb_poly_compose(acb_ptr res, acb_srcptr poly1, slong len1, acb_srcptr poly2, slong len2, slong prec); void acb_poly_compose(acb_poly_t res, const acb_poly_t poly1, const acb_poly_t poly2, slong prec); @@ -387,8 +387,8 @@ void acb_poly_compose_series(acb_poly_t res, /* Reversion */ -void _acb_poly_revert_series(acb_ptr Qinv, acb_srcptr Q, slong Qlen, slong n, slong prec); -void acb_poly_revert_series(acb_poly_t Qinv, const acb_poly_t Q, slong n, slong prec); +void _acb_poly_revert_series(acb_ptr h, acb_srcptr f, slong flen, slong n, slong prec); +void acb_poly_revert_series(acb_poly_t h, const acb_poly_t f, slong n, slong prec); @@ -496,11 +496,11 @@ void _acb_poly_pow_ui(acb_ptr res, acb_srcptr f, slong flen, ulong exp, slong pr void acb_poly_pow_ui(acb_poly_t res, const acb_poly_t poly, ulong exp, slong prec); -void _acb_poly_rsqrt_series(acb_ptr g, acb_srcptr h, slong hlen, slong len, slong prec); +void _acb_poly_rsqrt_series(acb_ptr g, acb_srcptr h, slong hlen, slong n, slong prec); void acb_poly_rsqrt_series(acb_poly_t g, const acb_poly_t h, slong n, slong prec); -void _acb_poly_sqrt_series(acb_ptr g, acb_srcptr h, slong hlen, slong len, slong prec); +void _acb_poly_sqrt_series(acb_ptr g, acb_srcptr h, slong hlen, slong n, slong prec); void acb_poly_sqrt_series(acb_poly_t g, const acb_poly_t h, slong n, slong prec); @@ -535,57 +535,57 @@ void acb_poly_sinh_series(acb_poly_t s, const acb_poly_t h, slong n, slong prec) void _acb_poly_cosh_series(acb_ptr c, acb_srcptr h, slong hlen, slong n, slong prec); void acb_poly_cosh_series(acb_poly_t c, const acb_poly_t h, slong n, slong prec); -void _acb_poly_sin_cos_series(acb_ptr s, acb_ptr c, acb_srcptr h, slong hlen, slong len, slong prec); +void _acb_poly_sin_cos_series(acb_ptr s, acb_ptr c, acb_srcptr h, slong hlen, slong n, slong prec); void acb_poly_sin_cos_series(acb_poly_t s, acb_poly_t c, const acb_poly_t h, slong n, slong prec); -void _acb_poly_sin_series(acb_ptr g, acb_srcptr h, slong hlen, slong n, slong prec); +void _acb_poly_sin_series(acb_ptr s, acb_srcptr h, slong hlen, slong n, slong prec); -void acb_poly_sin_series(acb_poly_t g, const acb_poly_t h, slong n, slong prec); +void acb_poly_sin_series(acb_poly_t s, const acb_poly_t h, slong n, slong prec); -void _acb_poly_cos_series(acb_ptr g, acb_srcptr h, slong hlen, slong n, slong prec); +void _acb_poly_cos_series(acb_ptr c, acb_srcptr h, slong hlen, slong n, slong prec); -void acb_poly_cos_series(acb_poly_t g, const acb_poly_t h, slong n, slong prec); +void acb_poly_cos_series(acb_poly_t c, const acb_poly_t h, slong n, slong prec); -void _acb_poly_sin_cos_pi_series(acb_ptr s, acb_ptr c, acb_srcptr h, slong hlen, slong len, slong prec); +void _acb_poly_sin_cos_pi_series(acb_ptr s, acb_ptr c, acb_srcptr h, slong hlen, slong n, slong prec); void acb_poly_sin_cos_pi_series(acb_poly_t s, acb_poly_t c, const acb_poly_t h, slong n, slong prec); -void _acb_poly_sin_pi_series(acb_ptr g, acb_srcptr h, slong hlen, slong n, slong prec); +void _acb_poly_sin_pi_series(acb_ptr s, acb_srcptr h, slong hlen, slong n, slong prec); -void acb_poly_sin_pi_series(acb_poly_t g, const acb_poly_t h, slong n, slong prec); +void acb_poly_sin_pi_series(acb_poly_t s, const acb_poly_t h, slong n, slong prec); -void _acb_poly_cos_pi_series(acb_ptr g, acb_srcptr h, slong hlen, slong n, slong prec); +void _acb_poly_cos_pi_series(acb_ptr c, acb_srcptr h, slong hlen, slong n, slong prec); -void acb_poly_cos_pi_series(acb_poly_t g, const acb_poly_t h, slong n, slong prec); +void acb_poly_cos_pi_series(acb_poly_t c, const acb_poly_t h, slong n, slong prec); -void _acb_poly_cot_pi_series(acb_ptr g, acb_srcptr h, slong hlen, slong len, slong prec); +void _acb_poly_cot_pi_series(acb_ptr c, acb_srcptr h, slong hlen, slong n, slong prec); -void acb_poly_cot_pi_series(acb_poly_t res, const acb_poly_t f, slong len, slong prec); +void acb_poly_cot_pi_series(acb_poly_t c, const acb_poly_t h, slong n, slong prec); void _acb_poly_tan_series(acb_ptr g, acb_srcptr h, slong hlen, slong len, slong prec); void acb_poly_tan_series(acb_poly_t g, const acb_poly_t h, slong n, slong prec); -void _acb_poly_sinc_series(acb_ptr g, acb_srcptr h, slong hlen, slong n, slong prec); -void acb_poly_sinc_series(acb_poly_t g, const acb_poly_t h, slong n, slong prec); +void _acb_poly_sinc_series(acb_ptr s, acb_srcptr h, slong hlen, slong n, slong prec); +void acb_poly_sinc_series(acb_poly_t s, const acb_poly_t h, slong n, slong prec); void _acb_poly_lambertw_series(acb_ptr res, acb_srcptr z, slong zlen, const fmpz_t k, int flags, slong len, slong prec); void acb_poly_lambertw_series(acb_poly_t res, const acb_poly_t z, const fmpz_t k, int flags, slong len, slong prec); -void _acb_poly_gamma_series(acb_ptr res, acb_srcptr h, slong hlen, slong len, slong prec); +void _acb_poly_gamma_series(acb_ptr res, acb_srcptr h, slong hlen, slong n, slong prec); -void acb_poly_gamma_series(acb_poly_t res, const acb_poly_t f, slong n, slong prec); +void acb_poly_gamma_series(acb_poly_t res, const acb_poly_t h, slong n, slong prec); -void _acb_poly_rgamma_series(acb_ptr res, acb_srcptr h, slong hlen, slong len, slong prec); +void _acb_poly_rgamma_series(acb_ptr res, acb_srcptr h, slong hlen, slong n, slong prec); -void acb_poly_rgamma_series(acb_poly_t res, const acb_poly_t f, slong n, slong prec); +void acb_poly_rgamma_series(acb_poly_t res, const acb_poly_t h, slong n, slong prec); -void _acb_poly_lgamma_series(acb_ptr res, acb_srcptr h, slong hlen, slong len, slong prec); +void _acb_poly_lgamma_series(acb_ptr res, acb_srcptr h, slong hlen, slong n, slong prec); -void acb_poly_lgamma_series(acb_poly_t res, const acb_poly_t f, slong n, slong prec); +void acb_poly_lgamma_series(acb_poly_t res, const acb_poly_t h, slong n, slong prec); -void _acb_poly_digamma_series(acb_ptr res, acb_srcptr h, slong hlen, slong len, slong prec); +void _acb_poly_digamma_series(acb_ptr res, acb_srcptr h, slong hlen, slong n, slong prec); -void acb_poly_digamma_series(acb_poly_t res, const acb_poly_t f, slong n, slong prec); +void acb_poly_digamma_series(acb_poly_t res, const acb_poly_t h, slong n, slong prec); void _acb_poly_rising_ui_series(acb_ptr res, acb_srcptr f, slong flen, ulong r, slong trunc, slong prec); @@ -653,7 +653,7 @@ void _acb_poly_zeta_em_choose_param(mag_t bound, ulong * N, ulong * M, const acb void _acb_poly_zeta_em_bound1(mag_t bound, const acb_t s, const acb_t a, slong N, slong M, slong d, slong wp); void _acb_poly_zeta_em_bound(arb_ptr vec, const acb_t s, const acb_t a, ulong N, ulong M, slong d, slong wp); -void _acb_poly_zeta_em_tail_naive(acb_ptr sum, const acb_t s, const acb_t Na, acb_srcptr Nasx, slong M, slong len, slong prec); +void _acb_poly_zeta_em_tail_naive(acb_ptr z, const acb_t s, const acb_t Na, acb_srcptr Nasx, slong M, slong len, slong prec); void _acb_poly_zeta_em_tail_bsplit(acb_ptr z, const acb_t s, const acb_t Na, acb_srcptr Nasx, slong M, slong len, slong prec); void _acb_poly_zeta_cpx_series(acb_ptr z, const acb_t s, const acb_t a, int deflate, slong d, slong prec); @@ -666,8 +666,8 @@ void _acb_poly_polylog_cpx_zeta(acb_ptr w, const acb_t s, const acb_t z, slong l void _acb_poly_polylog_cpx_small(acb_ptr w, const acb_t s, const acb_t z, slong len, slong prec); void _acb_poly_polylog_cpx(acb_ptr w, const acb_t s, const acb_t z, slong len, slong prec); -void _acb_poly_polylog_series(acb_ptr res, acb_srcptr s, slong slen, const acb_t z, slong len, slong prec); -void acb_poly_polylog_series(acb_poly_t res, const acb_poly_t s, const acb_t z, slong n, slong prec); +void _acb_poly_polylog_series(acb_ptr w, acb_srcptr s, slong slen, const acb_t z, slong len, slong prec); +void acb_poly_polylog_series(acb_poly_t w, const acb_poly_t s, const acb_t z, slong len, slong prec); void _acb_poly_agm1_series(acb_ptr res, acb_srcptr z, slong zlen, slong len, slong prec); void acb_poly_agm1_series(acb_poly_t res, const acb_poly_t z, slong n, slong prec); @@ -676,8 +676,8 @@ void acb_poly_elliptic_k_series(acb_poly_t res, const acb_poly_t z, slong n, slo void _acb_poly_elliptic_p_series(acb_ptr res, acb_srcptr z, slong zlen, const acb_t tau, slong len, slong prec); void acb_poly_elliptic_p_series(acb_poly_t res, const acb_poly_t z, const acb_t tau, slong n, slong prec); -void _acb_poly_erf_series(acb_ptr g, acb_srcptr h, slong hlen, slong n, slong prec); -void acb_poly_erf_series(acb_poly_t g, const acb_poly_t h, slong n, slong prec); +void _acb_poly_erf_series(acb_ptr res, acb_srcptr z, slong zlen, slong n, slong prec); +void acb_poly_erf_series(acb_poly_t res, const acb_poly_t z, slong n, slong prec); ACB_POLY_INLINE slong acb_poly_allocated_bytes(const acb_poly_t x) diff --git a/src/acb_theta.h b/src/acb_theta.h index b0e99f8c43..56a80cd8db 100644 --- a/src/acb_theta.h +++ b/src/acb_theta.h @@ -181,7 +181,7 @@ void acb_theta_dist_a0(arb_ptr d, acb_srcptr z, const acb_mat_t tau, slong prec) slong acb_theta_dist_addprec(const arb_t d); void acb_theta_agm_hadamard(acb_ptr res, acb_srcptr a, slong g, slong prec); -void acb_theta_agm_sqrt(acb_ptr res, acb_srcptr a, acb_srcptr roots, slong nb, slong prec); +void acb_theta_agm_sqrt(acb_ptr res, acb_srcptr a, acb_srcptr rts, slong nb, slong prec); void acb_theta_agm_mul(acb_ptr res, acb_srcptr a1, acb_srcptr a2, slong g, slong prec); void acb_theta_agm_mul_tight(acb_ptr res, acb_srcptr a0, acb_srcptr a, arb_srcptr d0, arb_srcptr d, slong g, slong prec); diff --git a/src/aprcl.h b/src/aprcl.h index f87281988c..ac086f1685 100644 --- a/src/aprcl.h +++ b/src/aprcl.h @@ -120,7 +120,7 @@ void unity_zp_init(unity_zp f, ulong p, ulong exp, const fmpz_t n); void unity_zp_clear(unity_zp f); void unity_zp_copy(unity_zp f, const unity_zp g); -void unity_zp_swap(unity_zp f, unity_zp g); +void unity_zp_swap(unity_zp f, unity_zp q); void unity_zp_set_zero(unity_zp f); @@ -217,7 +217,7 @@ void unity_zpq_clear(unity_zpq f); void unity_zpq_copy(unity_zpq f, const unity_zpq g); -void unity_zpq_swap(unity_zpq f, unity_zpq g); +void unity_zpq_swap(unity_zpq f, unity_zpq q); /* Comparison */ int unity_zpq_equal(const unity_zpq f, const unity_zpq g); @@ -236,11 +236,11 @@ void unity_zpq_mul(unity_zpq f, const unity_zpq g, const unity_zpq h); void _unity_zpq_mul_unity_p(unity_zpq f); -void unity_zpq_mul_unity_p_pow(unity_zpq f, const unity_zpq g, slong p); +void unity_zpq_mul_unity_p_pow(unity_zpq f, const unity_zpq g, slong k); /* Powering */ void unity_zpq_pow(unity_zpq f, const unity_zpq g, const fmpz_t p); -void unity_zpq_pow_ui(unity_zpq f, const unity_zpq g, ulong pow); +void unity_zpq_pow_ui(unity_zpq f, const unity_zpq g, ulong p); /* Gauss sum computation */ void unity_zpq_gauss_sum(unity_zpq f, ulong q, ulong p); diff --git a/src/arb.h b/src/arb.h index 2e7a23ab7d..02012cbf76 100644 --- a/src/arb.h +++ b/src/arb.h @@ -123,7 +123,7 @@ void arb_indeterminate(arb_t x); int arb_is_finite(const arb_t x); -void arb_set(arb_t x, const arb_t y); +void arb_set(arb_t y, const arb_t x); ARB_INLINE void arb_swap(arb_t x, arb_t y) @@ -131,18 +131,18 @@ arb_swap(arb_t x, arb_t y) FLINT_SWAP(arb_struct, *x, *y); } -void arb_set_round(arb_t z, const arb_t x, slong prec); +void arb_set_round(arb_t y, const arb_t x, slong prec); void arb_trim(arb_t y, const arb_t x); void arb_neg(arb_t y, const arb_t x); -void arb_neg_round(arb_t x, const arb_t y, slong prec); +void arb_neg_round(arb_t y, const arb_t x, slong prec); void arb_abs(arb_t y, const arb_t x); void arb_nonnegative_abs(arb_t y, const arb_t x); -void arb_sgn(arb_t res, const arb_t x); +void arb_sgn(arb_t y, const arb_t x); int arb_sgn_nonzero(const arb_t x); void _arb_digits_round_inplace(char * s, flint_bitcnt_t * shift, fmpz_t error, slong n, arf_rnd_t rnd); @@ -163,13 +163,13 @@ arb_set_arf(arb_t x, const arf_t y) mag_zero(arb_radref(x)); } -void arb_set_si(arb_t x, slong y); +void arb_set_si(arb_t y, slong x); -void arb_set_ui(arb_t x, ulong y); +void arb_set_ui(arb_t y, ulong x); -void arb_set_d(arb_t x, double y); +void arb_set_d(arb_t y, double x); -void arb_set_fmpz(arb_t x, const fmpz_t y); +void arb_set_fmpz(arb_t y, const fmpz_t x); ARB_INLINE void arb_set_fmpz_2exp(arb_t x, const fmpz_t y, const fmpz_t exp) @@ -178,7 +178,7 @@ arb_set_fmpz_2exp(arb_t x, const fmpz_t y, const fmpz_t exp) mag_zero(arb_radref(x)); } -void arb_set_round_fmpz_2exp(arb_t y, const fmpz_t x, const fmpz_t exp, slong prec); +void arb_set_round_fmpz_2exp(arb_t y, const fmpz_t x, const fmpz_t e, slong prec); void arb_set_round_fmpz(arb_t y, const fmpz_t x, slong prec); @@ -200,7 +200,7 @@ void arb_print(const arb_t x); void arb_printd(const arb_t x, slong digits); void arb_printn(const arb_t x, slong digits, ulong flags); -void _arb_vec_printn(arb_srcptr vec, slong len, slong ndigits, ulong flags); +void _arb_vec_printn(arb_srcptr vec, slong len, slong digits, ulong flags); void _arb_vec_printd(arb_srcptr vec, slong len, slong ndigits); void arb_mul_2exp_si(arb_t y, const arb_t x, slong e); @@ -304,11 +304,11 @@ void arb_urandom(arb_t x, flint_rand_t state, slong prec); void arb_add_error_arf(arb_t x, const arf_t err); -void arb_add_error_2exp_si(arb_t x, slong err); +void arb_add_error_2exp_si(arb_t x, slong e); -void arb_add_error_2exp_fmpz(arb_t x, const fmpz_t err); +void arb_add_error_2exp_fmpz(arb_t x, const fmpz_t e); -void arb_add_error(arb_t x, const arb_t error); +void arb_add_error(arb_t x, const arb_t err); ARB_INLINE void arb_add_error_mag(arb_t x, const mag_t err) @@ -341,10 +341,10 @@ int arb_get_unique_fmpz(fmpz_t z, const arb_t x); void arb_get_fmpz_mid_rad_10exp(fmpz_t mid, fmpz_t rad, fmpz_t exp, const arb_t x, slong n); -void arb_floor(arb_t z, const arb_t x, slong prec); -void arb_ceil(arb_t z, const arb_t x, slong prec); -void arb_nint(arb_t res, const arb_t x, slong prec); -void arb_trunc(arb_t res, const arb_t x, slong prec); +void arb_floor(arb_t y, const arb_t x, slong prec); +void arb_ceil(arb_t y, const arb_t x, slong prec); +void arb_nint(arb_t y, const arb_t x, slong prec); +void arb_trunc(arb_t y, const arb_t x, slong prec); void arb_set_interval_arf(arb_t x, const arf_t a, const arf_t b, slong prec); #ifdef __MPFR_H @@ -356,8 +356,8 @@ void arb_get_interval_arf(arf_t a, arf_t b, const arb_t x, slong prec); void arb_get_interval_mpfr(mpfr_t a, mpfr_t b, const arb_t x); #endif -void arb_set_interval_mag(arb_t res, const mag_t a, const mag_t b, slong prec); -void arb_set_interval_neg_pos_mag(arb_t res, const mag_t a, const mag_t b, slong prec); +void arb_set_interval_mag(arb_t x, const mag_t a, const mag_t b, slong prec); +void arb_set_interval_neg_pos_mag(arb_t x, const mag_t a, const mag_t b, slong prec); void arb_union(arb_t z, const arb_t x, const arb_t y, slong prec); int arb_intersection(arb_t z, const arb_t x, const arb_t y, slong prec); @@ -377,7 +377,7 @@ void arb_add_arf(arb_t z, const arb_t x, const arf_t y, slong prec); void arb_add_ui(arb_t z, const arb_t x, ulong y, slong prec); void arb_add_si(arb_t z, const arb_t x, slong y, slong prec); void arb_add_fmpz(arb_t z, const arb_t x, const fmpz_t y, slong prec); -void arb_add_fmpz_2exp(arb_t z, const arb_t x, const fmpz_t man, const fmpz_t exp, slong prec); +void arb_add_fmpz_2exp(arb_t z, const arb_t x, const fmpz_t m, const fmpz_t e, slong prec); void arb_sub(arb_t z, const arb_t x, const arb_t y, slong prec); void arb_sub_arf(arb_t z, const arb_t x, const arf_t y, slong prec); @@ -464,7 +464,7 @@ void arb_hypot(arb_t z, const arb_t x, const arb_t y, slong prec); void arb_rsqrt(arb_t z, const arb_t x, slong prec); void arb_rsqrt_ui(arb_t z, ulong x, slong prec); -void arb_sqrt1pm1(arb_t r, const arb_t z, slong prec); +void arb_sqrt1pm1(arb_t z, const arb_t x, slong prec); void arb_rsqrt_arf_newton(arb_t res, const arf_t x, slong prec); void arb_sqrt_arf_newton(arb_t res, const arf_t x, slong prec); @@ -485,7 +485,7 @@ void arb_log(arb_t z, const arb_t x, slong prec); void arb_log_arf(arb_t z, const arf_t x, slong prec); void arb_log_ui(arb_t z, ulong x, slong prec); void arb_log_fmpz(arb_t z, const fmpz_t x, slong prec); -void arb_log1p(arb_t r, const arb_t z, slong prec); +void arb_log1p(arb_t z, const arb_t x, slong prec); void arb_log_base_ui(arb_t res, const arb_t x, ulong b, slong prec); void arb_log_hypot(arb_t res, const arb_t x, const arb_t y, slong prec); void arb_exp(arb_t z, const arb_t x, slong prec); @@ -509,8 +509,8 @@ void arb_sin_pi_fmpq(arb_t s, const fmpq_t x, slong prec); void arb_cos_pi_fmpq(arb_t c, const fmpq_t x, slong prec); void arb_sinc(arb_t z, const arb_t x, slong prec); void arb_sinc_pi(arb_t z, const arb_t x, slong prec); -void arb_sinh(arb_t z, const arb_t x, slong prec); -void arb_cosh(arb_t z, const arb_t x, slong prec); +void arb_sinh(arb_t s, const arb_t x, slong prec); +void arb_cosh(arb_t c, const arb_t x, slong prec); void arb_sinh_cosh(arb_t s, arb_t c, const arb_t x, slong prec); void arb_tanh(arb_t y, const arb_t x, slong prec); void arb_coth(arb_t y, const arb_t x, slong prec); @@ -545,7 +545,7 @@ void arb_const_catalan(arb_t z, slong prec); void arb_const_e(arb_t z, slong prec); void arb_const_khinchin(arb_t z, slong prec); void arb_const_glaisher(arb_t z, slong prec); -void arb_const_reciprocal_fibonacci(arb_t res, slong prec); +void arb_const_reciprocal_fibonacci(arb_t z, slong prec); void arb_agm(arb_t z, const arb_t x, const arb_t y, slong prec); void arb_lgamma(arb_t z, const arb_t x, slong prec); void arb_rgamma(arb_t z, const arb_t x, slong prec); @@ -557,20 +557,20 @@ void arb_zeta(arb_t z, const arb_t s, slong prec); void arb_hurwitz_zeta(arb_t z, const arb_t s, const arb_t a, slong prec); void arb_rising_ui(arb_t z, const arb_t x, ulong n, slong prec); -void arb_rising_fmpq_ui(arb_t y, const fmpq_t x, ulong n, slong prec); +void arb_rising_fmpq_ui(arb_t z, const fmpq_t x, ulong n, slong prec); void arb_rising(arb_t z, const arb_t x, const arb_t n, slong prec); void arb_rising2_ui(arb_t u, arb_t v, const arb_t x, ulong n, slong prec); -void arb_log_ui_from_prev(arb_t s, ulong k, arb_t log_prev, ulong prev, slong prec); +void arb_log_ui_from_prev(arb_t log_k1, ulong k1, arb_t log_k0, ulong k0, slong prec); -void arb_const_apery(arb_t s, slong prec); +void arb_const_apery(arb_t z, slong prec); void arb_zeta_ui_asymp(arb_t x, ulong s, slong prec); void arb_zeta_ui_borwein_bsplit(arb_t x, ulong s, slong prec); void arb_zeta_ui_euler_product(arb_t z, ulong s, slong prec); -void arb_zeta_ui_bernoulli(arb_t x, ulong n, slong prec); +void arb_zeta_ui_bernoulli(arb_t x, ulong s, slong prec); void arb_zeta_ui_vec_borwein(arb_ptr z, ulong start, slong num, ulong step, slong prec); -void arb_zeta_ui(arb_t x, ulong n, slong prec); +void arb_zeta_ui(arb_t x, ulong s, slong prec); void arb_zeta_ui_vec_even(arb_ptr x, ulong start, slong num, slong prec); void arb_zeta_ui_vec_odd(arb_ptr x, ulong start, slong num, slong prec); void arb_zeta_ui_vec(arb_ptr x, ulong start, slong num, slong prec); @@ -959,7 +959,7 @@ void _arb_exp_taylor_naive(mp_ptr y, mp_limb_t * error, void _arb_exp_taylor_rs(mp_ptr y, mp_limb_t * error, mp_srcptr x, mp_size_t xn, ulong N); -void arb_exp_arf_bb(arb_t z, const arf_t x, slong prec, int minus_one); +void arb_exp_arf_bb(arb_t z, const arf_t x, slong prec, int m1); void arb_exp_arf_rs_generic(arb_t res, const arf_t x, slong prec, int minus_one); int _arb_get_mpn_fixed_mod_log2(mp_ptr w, fmpz_t q, mp_limb_t * error, @@ -1014,9 +1014,9 @@ void _arb_sin_cos_taylor_rs(mp_ptr ysin, mp_ptr ycos, int _arb_get_mpn_fixed_mod_pi4(mp_ptr w, fmpz_t q, int * octant, mp_limb_t * error, const arf_t x, mp_size_t wn); -void arb_sin_cos_arf_bb(arb_t zsin, arb_t zcos, const arf_t x, slong prec); +void arb_sin_cos_arf_bb(arb_t s, arb_t c, const arf_t x, slong prec); void arb_sin_cos_arf_rs_generic(arb_t res_sin, arb_t res_cos, const arf_t x, slong prec); -void arb_sin_cos_arf_generic(arb_t res_sin, arb_t res_cos, const arf_t x, slong prec); +void arb_sin_cos_arf_generic(arb_t s, arb_t c, const arf_t x, slong prec); void _arb_sin_cos_wide(arb_t s, arb_t c, const arf_t x, const mag_t r, slong prec); void arb_sin_cos_wide(arb_t s, arb_t c, const arb_t x, slong prec); diff --git a/src/arb_fmpz_poly.h b/src/arb_fmpz_poly.h index 15cec53d28..f59b8d21d5 100644 --- a/src/arb_fmpz_poly.h +++ b/src/arb_fmpz_poly.h @@ -22,23 +22,23 @@ extern "C" { #define ARB_FMPZ_POLY_ROOTS_VERBOSE 1 void _arb_fmpz_poly_evaluate_acb_horner(acb_t res, const fmpz * f, slong len, const acb_t x, slong prec); -void arb_fmpz_poly_evaluate_acb_horner(acb_t res, const fmpz_poly_t f, const acb_t a, slong prec); +void arb_fmpz_poly_evaluate_acb_horner(acb_t res, const fmpz_poly_t poly, const acb_t x, slong prec); void _arb_fmpz_poly_evaluate_acb_rectangular(acb_t res, const fmpz * f, slong len, const acb_t x, slong prec); -void arb_fmpz_poly_evaluate_acb_rectangular(acb_t res, const fmpz_poly_t f, const acb_t a, slong prec); +void arb_fmpz_poly_evaluate_acb_rectangular(acb_t res, const fmpz_poly_t poly, const acb_t x, slong prec); void _arb_fmpz_poly_evaluate_acb(acb_t res, const fmpz * f, slong len, const acb_t x, slong prec); -void arb_fmpz_poly_evaluate_acb(acb_t res, const fmpz_poly_t f, const acb_t a, slong prec); +void arb_fmpz_poly_evaluate_acb(acb_t res, const fmpz_poly_t poly, const acb_t x, slong prec); void _arb_fmpz_poly_evaluate_arb_horner(arb_t res, const fmpz * f, slong len, const arb_t x, slong prec); -void arb_fmpz_poly_evaluate_arb_horner(arb_t res, const fmpz_poly_t f, const arb_t a, slong prec); +void arb_fmpz_poly_evaluate_arb_horner(arb_t res, const fmpz_poly_t poly, const arb_t x, slong prec); void _arb_fmpz_poly_evaluate_arb_rectangular(arb_t res, const fmpz * f, slong len, const arb_t x, slong prec); -void arb_fmpz_poly_evaluate_arb_rectangular(arb_t res, const fmpz_poly_t f, const arb_t a, slong prec); +void arb_fmpz_poly_evaluate_arb_rectangular(arb_t res, const fmpz_poly_t poly, const arb_t x, slong prec); void _arb_fmpz_poly_evaluate_arb(arb_t res, const fmpz * f, slong len, const arb_t x, slong prec); -void arb_fmpz_poly_evaluate_arb(arb_t res, const fmpz_poly_t f, const arb_t a, slong prec); +void arb_fmpz_poly_evaluate_arb(arb_t res, const fmpz_poly_t poly, const arb_t x, slong prec); -void arb_fmpz_poly_deflate(fmpz_poly_t result, const fmpz_poly_t input, ulong deflation); -ulong arb_fmpz_poly_deflation(const fmpz_poly_t input); +void arb_fmpz_poly_deflate(fmpz_poly_t res, const fmpz_poly_t poly, ulong deflation); +ulong arb_fmpz_poly_deflation(const fmpz_poly_t poly); -void arb_fmpz_poly_complex_roots(acb_ptr roots, const fmpz_poly_t poly, int flags, slong target_prec); +void arb_fmpz_poly_complex_roots(acb_ptr roots, const fmpz_poly_t poly, int flags, slong prec); void arb_fmpz_poly_gauss_period_minpoly(fmpz_poly_t res, ulong q, ulong n); diff --git a/src/arb_hypgeom.h b/src/arb_hypgeom.h index 43f40d4ea9..f064e77456 100644 --- a/src/arb_hypgeom.h +++ b/src/arb_hypgeom.h @@ -26,8 +26,8 @@ void arb_hypgeom_rising_ui_forward(arb_t res, const arb_t x, ulong n, slong prec void arb_hypgeom_rising_ui_rs(arb_t res, const arb_t x, ulong n, ulong m, slong prec); void arb_hypgeom_rising_ui_bs(arb_t res, const arb_t x, ulong n, slong prec); void arb_hypgeom_rising_ui_rec(arb_t res, const arb_t x, ulong n, slong prec); -void arb_hypgeom_rising_ui(arb_t y, const arb_t x, ulong n, slong prec); -void arb_hypgeom_rising(arb_t y, const arb_t x, const arb_t n, slong prec); +void arb_hypgeom_rising_ui(arb_t res, const arb_t x, ulong n, slong prec); +void arb_hypgeom_rising(arb_t res, const arb_t x, const arb_t n, slong prec); void arb_hypgeom_rising_ui_jet_powsum(arb_ptr res, const arb_t x, ulong n, slong len, slong prec); void arb_hypgeom_rising_ui_jet_rs(arb_ptr res, const arb_t x, ulong n, ulong m, slong len, slong prec); @@ -35,8 +35,8 @@ void arb_hypgeom_rising_ui_jet_bs(arb_ptr res, const arb_t x, ulong n, slong len void arb_hypgeom_rising_ui_jet(arb_ptr res, const arb_t x, ulong n, slong len, slong prec); void _arb_hypgeom_gamma_stirling_term_bounds(slong * bound, const mag_t zinv, slong N); -void arb_hypgeom_gamma_stirling_sum_horner(arb_t s, const arb_t z, slong N, slong prec); -void arb_hypgeom_gamma_stirling_sum_improved(arb_t s, const arb_t z, slong N, slong K, slong prec); +void arb_hypgeom_gamma_stirling_sum_horner(arb_t res, const arb_t z, slong N, slong prec); +void arb_hypgeom_gamma_stirling_sum_improved(arb_t res, const arb_t z, slong N, slong K, slong prec); #define ARB_HYPGEOM_GAMMA_TAB_NUM 536 #define ARB_HYPGEOM_GAMMA_TAB_PREC 3456 @@ -55,13 +55,13 @@ int _arb_hypgeom_gamma_coeff_shallow(arf_t c, mag_t err, slong i, slong prec); void arb_hypgeom_gamma_stirling(arb_t res, const arb_t x, int reciprocal, slong prec); int arb_hypgeom_gamma_taylor(arb_t res, const arb_t x, int reciprocal, slong prec); -void arb_hypgeom_gamma(arb_t y, const arb_t x, slong prec); -void arb_hypgeom_rgamma(arb_t y, const arb_t x, slong prec); +void arb_hypgeom_gamma(arb_t res, const arb_t x, slong prec); +void arb_hypgeom_rgamma(arb_t res, const arb_t x, slong prec); -void arb_hypgeom_lgamma(arb_t y, const arb_t x, slong prec); +void arb_hypgeom_lgamma(arb_t res, const arb_t x, slong prec); -void arb_hypgeom_gamma_fmpq(arb_t y, const fmpq_t x, slong prec); -void arb_hypgeom_gamma_fmpz(arb_t y, const fmpz_t x, slong prec); +void arb_hypgeom_gamma_fmpq(arb_t res, const fmpq_t x, slong prec); +void arb_hypgeom_gamma_fmpz(arb_t res, const fmpz_t x, slong prec); void arb_hypgeom_pfq(arb_t res, arb_srcptr a, slong p, arb_srcptr b, slong q, const arb_t z, int regularized, slong prec); @@ -77,53 +77,53 @@ void arb_hypgeom_u_integration(arb_t res, const arb_t a, const arb_t b, const ar void arb_hypgeom_2f1_integration(arb_t res, const arb_t a, const arb_t b, const arb_t c, const arb_t z, int regularized, slong prec); void arb_hypgeom_erf(arb_t res, const arb_t z, slong prec); -void _arb_hypgeom_erf_series(arb_ptr g, arb_srcptr h, slong hlen, slong len, slong prec); -void arb_hypgeom_erf_series(arb_poly_t g, const arb_poly_t h, slong len, slong prec); +void _arb_hypgeom_erf_series(arb_ptr res, arb_srcptr z, slong zlen, slong len, slong prec); +void arb_hypgeom_erf_series(arb_poly_t res, const arb_poly_t z, slong len, slong prec); void arb_hypgeom_erfc(arb_t res, const arb_t z, slong prec); -void _arb_hypgeom_erfc_series(arb_ptr g, arb_srcptr h, slong hlen, slong len, slong prec); -void arb_hypgeom_erfc_series(arb_poly_t g, const arb_poly_t h, slong len, slong prec); +void _arb_hypgeom_erfc_series(arb_ptr res, arb_srcptr z, slong zlen, slong len, slong prec); +void arb_hypgeom_erfc_series(arb_poly_t res, const arb_poly_t z, slong len, slong prec); void arb_hypgeom_erfi(arb_t res, const arb_t z, slong prec); -void _arb_hypgeom_erfi_series(arb_ptr g, arb_srcptr h, slong hlen, slong len, slong prec); -void arb_hypgeom_erfi_series(arb_poly_t g, const arb_poly_t h, slong len, slong prec); +void _arb_hypgeom_erfi_series(arb_ptr res, arb_srcptr z, slong zlen, slong len, slong prec); +void arb_hypgeom_erfi_series(arb_poly_t res, const arb_poly_t z, slong len, slong prec); -void arb_hypgeom_erfinv(arb_t res, const arb_t x, slong prec); -void arb_hypgeom_erfcinv(arb_t res, const arb_t x, slong prec); +void arb_hypgeom_erfinv(arb_t res, const arb_t z, slong prec); +void arb_hypgeom_erfcinv(arb_t res, const arb_t z, slong prec); void arb_hypgeom_fresnel(arb_t res1, arb_t res2, const arb_t z, int normalized, slong prec); -void _arb_hypgeom_fresnel_series(arb_ptr s, arb_ptr c, arb_srcptr h, slong hlen, int normalized, slong len, slong prec); -void arb_hypgeom_fresnel_series(arb_poly_t s, arb_poly_t c, const arb_poly_t h, int normalized, slong len, slong prec); +void _arb_hypgeom_fresnel_series(arb_ptr res1, arb_ptr res2, arb_srcptr z, slong zlen, int normalized, slong len, slong prec); +void arb_hypgeom_fresnel_series(arb_poly_t res1, arb_poly_t res2, const arb_poly_t z, int normalized, slong len, slong prec); void arb_hypgeom_ei(arb_t res, const arb_t z, slong prec); -void _arb_hypgeom_ei_series(arb_ptr g, arb_srcptr h, slong hlen, slong len, slong prec); -void arb_hypgeom_ei_series(arb_poly_t g, const arb_poly_t h, slong len, slong prec); +void _arb_hypgeom_ei_series(arb_ptr res, arb_srcptr z, slong zlen, slong len, slong prec); +void arb_hypgeom_ei_series(arb_poly_t res, const arb_poly_t z, slong len, slong prec); void _arb_hypgeom_si_asymp(arb_t res, const arb_t z, slong N, slong prec); void _arb_hypgeom_si_1f2(arb_t res, const arb_t z, slong N, slong wp, slong prec); void arb_hypgeom_si(arb_t res, const arb_t z, slong prec); -void _arb_hypgeom_si_series(arb_ptr g, arb_srcptr h, slong hlen, slong len, slong prec); -void arb_hypgeom_si_series(arb_poly_t g, const arb_poly_t h, slong len, slong prec); +void _arb_hypgeom_si_series(arb_ptr res, arb_srcptr z, slong zlen, slong len, slong prec); +void arb_hypgeom_si_series(arb_poly_t res, const arb_poly_t z, slong len, slong prec); void _arb_hypgeom_ci_asymp(arb_t res, const arb_t z, slong N, slong prec); void _arb_hypgeom_ci_2f3(arb_t res, const arb_t z, slong N, slong wp, slong prec); void arb_hypgeom_ci(arb_t res, const arb_t z, slong prec); -void _arb_hypgeom_ci_series(arb_ptr g, arb_srcptr h, slong hlen, slong len, slong prec); -void arb_hypgeom_ci_series(arb_poly_t g, const arb_poly_t h, slong len, slong prec); +void _arb_hypgeom_ci_series(arb_ptr res, arb_srcptr z, slong zlen, slong len, slong prec); +void arb_hypgeom_ci_series(arb_poly_t res, const arb_poly_t z, slong len, slong prec); void arb_hypgeom_shi(arb_t res, const arb_t z, slong prec); -void _arb_hypgeom_shi_series(arb_ptr g, arb_srcptr h, slong hlen, slong len, slong prec); -void arb_hypgeom_shi_series(arb_poly_t g, const arb_poly_t h, slong len, slong prec); +void _arb_hypgeom_shi_series(arb_ptr res, arb_srcptr z, slong zlen, slong len, slong prec); +void arb_hypgeom_shi_series(arb_poly_t res, const arb_poly_t z, slong len, slong prec); void arb_hypgeom_chi(arb_t res, const arb_t z, slong prec); -void _arb_hypgeom_chi_series(arb_ptr g, arb_srcptr h, slong hlen, slong len, slong prec); -void arb_hypgeom_chi_series(arb_poly_t g, const arb_poly_t h, slong len, slong prec); +void _arb_hypgeom_chi_series(arb_ptr res, arb_srcptr z, slong zlen, slong len, slong prec); +void arb_hypgeom_chi_series(arb_poly_t res, const arb_poly_t z, slong len, slong prec); void arb_hypgeom_li(arb_t res, const arb_t z, int offset, slong prec); -void _arb_hypgeom_li_series(arb_ptr g, arb_srcptr h, slong hlen, int offset, slong len, slong prec); -void arb_hypgeom_li_series(arb_poly_t g, const arb_poly_t h, int offset, slong len, slong prec); +void _arb_hypgeom_li_series(arb_ptr res, arb_srcptr z, slong zlen, int offset, slong len, slong prec); +void arb_hypgeom_li_series(arb_poly_t res, const arb_poly_t z, int offset, slong len, slong prec); void arb_hypgeom_bessel_j(arb_t res, const arb_t nu, const arb_t z, slong prec); void arb_hypgeom_bessel_y(arb_t res, const arb_t nu, const arb_t z, slong prec); @@ -137,14 +137,14 @@ void arb_hypgeom_bessel_k_scaled(arb_t res, const arb_t nu, const arb_t z, slong void arb_hypgeom_bessel_i_integration(arb_t res, const arb_t nu, const arb_t z, int scaled, slong prec); void arb_hypgeom_bessel_k_integration(arb_t res, const arb_t nu, const arb_t z, int scaled, slong prec); -void arb_hypgeom_airy(arb_t ai, arb_t aip, arb_t bi, arb_t bip, const arb_t z, slong prec); +void arb_hypgeom_airy(arb_t ai, arb_t ai_prime, arb_t bi, arb_t bi_prime, const arb_t z, slong prec); void arb_hypgeom_airy_jet(arb_ptr ai, arb_ptr bi, const arb_t z, slong len, slong prec); void arb_hypgeom_airy_series(arb_poly_t ai, arb_poly_t ai_prime, arb_poly_t bi, arb_poly_t bi_prime, const arb_poly_t z, slong len, slong prec); void _arb_hypgeom_airy_series(arb_ptr ai, arb_ptr ai_prime, arb_ptr bi, arb_ptr bi_prime, arb_srcptr z, slong zlen, slong len, slong prec); -void arb_hypgeom_airy_zero(arb_t ai, arb_t aip, arb_t bi, arb_t bip, const fmpz_t n, slong prec); +void arb_hypgeom_airy_zero(arb_t a, arb_t a_prime, arb_t b, arb_t b_prime, const fmpz_t n, slong prec); void arb_hypgeom_coulomb(arb_t F, arb_t G, const arb_t l, const arb_t eta, const arb_t z, slong prec); void arb_hypgeom_coulomb_jet(arb_ptr F, arb_ptr G, const arb_t l, const arb_t eta, const arb_t z, slong len, slong prec); @@ -154,18 +154,18 @@ void arb_hypgeom_coulomb_series(arb_poly_t F, arb_poly_t G, const arb_t l, const void arb_hypgeom_expint(arb_t res, const arb_t s, const arb_t z, slong prec); void arb_hypgeom_gamma_lower(arb_t res, const arb_t s, const arb_t z, int regularized, slong prec); -void _arb_hypgeom_gamma_lower_series(arb_ptr g, const arb_t s, arb_srcptr h, slong hlen, int regularized, slong n, slong prec); -void arb_hypgeom_gamma_lower_series(arb_poly_t g, const arb_t s, const arb_poly_t h, int regularized, slong n, slong prec); +void _arb_hypgeom_gamma_lower_series(arb_ptr res, const arb_t s, arb_srcptr z, slong zlen, int regularized, slong n, slong prec); +void arb_hypgeom_gamma_lower_series(arb_poly_t res, const arb_t s, const arb_poly_t z, int regularized, slong n, slong prec); void arb_hypgeom_gamma_upper(arb_t res, const arb_t s, const arb_t z, int regularized, slong prec); -void _arb_hypgeom_gamma_upper_series(arb_ptr g, const arb_t s, arb_srcptr h, slong hlen, int regularized, slong n, slong prec); -void arb_hypgeom_gamma_upper_series(arb_poly_t g, const arb_t s, const arb_poly_t h, int regularized, slong n, slong prec); +void _arb_hypgeom_gamma_upper_series(arb_ptr res, const arb_t s, arb_srcptr z, slong zlen, int regularized, slong n, slong prec); +void arb_hypgeom_gamma_upper_series(arb_poly_t res, const arb_t s, const arb_poly_t z, int regularized, slong n, slong prec); void arb_hypgeom_gamma_upper_integration(arb_t res, const arb_t s, const arb_t z, int regularized, slong prec); -void arb_hypgeom_beta_lower(arb_t res, const arb_t a, const arb_t c, const arb_t z, int regularized, slong prec); -void arb_hypgeom_beta_lower_series(arb_poly_t res, const arb_t a, const arb_t b, const arb_poly_t z, int regularized, slong len, slong prec); -void _arb_hypgeom_beta_lower_series(arb_ptr res, const arb_t a, const arb_t b, arb_srcptr z, slong zlen, int regularized, slong len, slong prec); +void arb_hypgeom_beta_lower(arb_t res, const arb_t a, const arb_t b, const arb_t z, int regularized, slong prec); +void arb_hypgeom_beta_lower_series(arb_poly_t res, const arb_t a, const arb_t b, const arb_poly_t z, int regularized, slong n, slong prec); +void _arb_hypgeom_beta_lower_series(arb_ptr res, const arb_t a, const arb_t b, arb_srcptr z, slong zlen, int regularized, slong n, slong prec); void arb_hypgeom_chebyshev_t(arb_t res, const arb_t nu, const arb_t z, slong prec); void arb_hypgeom_chebyshev_u(arb_t res, const arb_t nu, const arb_t z, slong prec); @@ -178,9 +178,9 @@ void arb_hypgeom_legendre_q(arb_t res, const arb_t n, const arb_t m, const arb_t void arb_hypgeom_legendre_p_ui_deriv_bound(mag_t dp, mag_t dp2, ulong n, const arb_t x, const arb_t x2sub1); void arb_hypgeom_legendre_p_ui_rec(arb_t res, arb_t res_prime, ulong n, const arb_t x, slong prec); -void arb_hypgeom_legendre_p_ui_asymp(arb_t res, arb_t res2, ulong n, const arb_t x, slong K, slong prec); -void arb_hypgeom_legendre_p_ui_one(arb_t res, arb_t res2, ulong n, const arb_t x, slong K, slong prec); -void arb_hypgeom_legendre_p_ui_zero(arb_t res, arb_t res2, ulong n, const arb_t x, slong K, slong prec); +void arb_hypgeom_legendre_p_ui_asymp(arb_t res, arb_t res_prime, ulong n, const arb_t x, slong K, slong prec); +void arb_hypgeom_legendre_p_ui_one(arb_t res, arb_t res_prime, ulong n, const arb_t x, slong K, slong prec); +void arb_hypgeom_legendre_p_ui_zero(arb_t res, arb_t res_prime, ulong n, const arb_t x, slong K, slong prec); void arb_hypgeom_legendre_p_ui(arb_t res, arb_t res_prime, ulong n, const arb_t x, slong prec); void arb_hypgeom_legendre_p_ui_root(arb_t res, arb_t weight, ulong n, ulong k, slong prec); diff --git a/src/arb_mat.h b/src/arb_mat.h index 112e0a9c25..c7b14bc652 100644 --- a/src/arb_mat.h +++ b/src/arb_mat.h @@ -121,7 +121,7 @@ arb_mat_is_square(const arb_mat_t mat) return (mat->r == mat->c); } -int arb_mat_is_exact(const arb_mat_t A); +int arb_mat_is_exact(const arb_mat_t mat); int arb_mat_is_zero(const arb_mat_t mat); int arb_mat_is_finite(const arb_mat_t mat); @@ -174,7 +174,7 @@ void arb_mat_stirling(arb_mat_t mat, int kind, slong prec); void arb_mat_dct(arb_mat_t mat, int type, slong prec); -void arb_mat_transpose(arb_mat_t mat1, const arb_mat_t mat2); +void arb_mat_transpose(arb_mat_t dest, const arb_mat_t src); /* Norms */ @@ -182,7 +182,7 @@ void arb_mat_bound_inf_norm(mag_t b, const arb_mat_t A); void arb_mat_frobenius_norm(arb_t res, const arb_mat_t A, slong prec); -void arb_mat_bound_frobenius_norm(mag_t b, const arb_mat_t A); +void arb_mat_bound_frobenius_norm(mag_t res, const arb_mat_t A); /* Arithmetic */ @@ -202,12 +202,12 @@ void _arb_mat_addmul_rad_mag_fast(arb_mat_t C, mag_srcptr A, mag_srcptr B, slong void arb_mat_mul_block(arb_mat_t C, const arb_mat_t A, const arb_mat_t B, slong prec); -void arb_mat_mul_entrywise(arb_mat_t res, const arb_mat_t mat1, const arb_mat_t mat2, slong prec); +void arb_mat_mul_entrywise(arb_mat_t C, const arb_mat_t A, const arb_mat_t B, slong prec); void arb_mat_sqr_classical(arb_mat_t B, const arb_mat_t A, slong prec); -void arb_mat_sqr(arb_mat_t B, const arb_mat_t A, slong prec); +void arb_mat_sqr(arb_mat_t res, const arb_mat_t mat, slong prec); -void arb_mat_pow_ui(arb_mat_t B, const arb_mat_t A, ulong exp, slong prec); +void arb_mat_pow_ui(arb_mat_t res, const arb_mat_t mat, ulong exp, slong prec); /* Scalar arithmetic */ @@ -362,7 +362,7 @@ int arb_mat_solve_precond(arb_mat_t X, const arb_mat_t A, const arb_mat_t B, slo int arb_mat_solve_preapprox(arb_mat_t X, const arb_mat_t A, const arb_mat_t B, const arb_mat_t R, const arb_mat_t T, slong prec); -void arb_mat_approx_mul(arb_mat_t C, const arb_mat_t A, const arb_mat_t B, slong prec); +void arb_mat_approx_mul(arb_mat_t res, const arb_mat_t mat1, const arb_mat_t mat2, slong prec); void arb_mat_approx_solve_triu(arb_mat_t X, const arb_mat_t U, const arb_mat_t B, int unit, slong prec); void arb_mat_approx_solve_tril(arb_mat_t X, const arb_mat_t L, const arb_mat_t B, int unit, slong prec); int arb_mat_approx_lu(slong * P, arb_mat_t LU, const arb_mat_t A, slong prec); @@ -393,7 +393,7 @@ int _arb_mat_ldl_inplace(arb_mat_t A, slong prec); int _arb_mat_ldl_golub_and_van_loan(arb_mat_t A, slong prec); -int arb_mat_ldl(arb_mat_t L, const arb_mat_t A, slong prec); +int arb_mat_ldl(arb_mat_t res, const arb_mat_t A, slong prec); void arb_mat_solve_ldl_precomp(arb_mat_t X, const arb_mat_t L, const arb_mat_t B, slong prec); @@ -413,8 +413,8 @@ void arb_mat_companion(arb_mat_t mat, const arb_poly_t poly, slong prec); void arb_mat_trace(arb_t trace, const arb_mat_t mat, slong prec); -void _arb_mat_diag_prod(arb_t res, const arb_mat_t A, slong a, slong b, slong prec); -void arb_mat_diag_prod(arb_t res, const arb_mat_t A, slong prec); +void _arb_mat_diag_prod(arb_t res, const arb_mat_t mat, slong a, slong b, slong prec); +void arb_mat_diag_prod(arb_t res, const arb_mat_t mat, slong prec); /* Sparsity structure */ diff --git a/src/arb_poly.h b/src/arb_poly.h index 066c551df2..f7f7c67b49 100644 --- a/src/arb_poly.h +++ b/src/arb_poly.h @@ -46,13 +46,13 @@ arb_poly_swap(arb_poly_t poly1, arb_poly_t poly2) FLINT_SWAP(arb_poly_struct, *poly1, *poly2); } -void arb_poly_set(arb_poly_t poly, const arb_poly_t src); +void arb_poly_set(arb_poly_t dest, const arb_poly_t src); -void arb_poly_set_round(arb_poly_t poly, const arb_poly_t src, slong prec); +void arb_poly_set_round(arb_poly_t dest, const arb_poly_t src, slong prec); -void arb_poly_set_trunc(arb_poly_t res, const arb_poly_t poly, slong n); +void arb_poly_set_trunc(arb_poly_t dest, const arb_poly_t src, slong n); -void arb_poly_set_trunc_round(arb_poly_t res, const arb_poly_t poly, slong n, slong prec); +void arb_poly_set_trunc_round(arb_poly_t dest, const arb_poly_t src, slong n, slong prec); /* Basic manipulation */ @@ -100,11 +100,11 @@ arb_poly_one(arb_poly_t poly) _arb_poly_set_length(poly, 1); } -void arb_poly_set_coeff_si(arb_poly_t poly, slong n, slong x); +void arb_poly_set_coeff_si(arb_poly_t poly, slong n, slong c); -void arb_poly_set_coeff_arb(arb_poly_t poly, slong n, const arb_t x); +void arb_poly_set_coeff_arb(arb_poly_t poly, slong n, const arb_t c); -void arb_poly_get_coeff_arb(arb_t x, const arb_poly_t poly, slong n); +void arb_poly_get_coeff_arb(arb_t v, const arb_poly_t poly, slong n); #define arb_poly_get_coeff_ptr(poly, n) \ ((n) < (poly)->length ? (poly)->coeffs + (n) : NULL) @@ -146,9 +146,9 @@ arb_poly_set_arb(arb_poly_t poly, const arb_t c) _arb_poly_set_length(poly, !arb_is_zero(poly->coeffs)); } -void arb_poly_set_si(arb_poly_t poly, slong c); +void arb_poly_set_si(arb_poly_t poly, slong src); -int arb_poly_get_unique_fmpz_poly(fmpz_poly_t res, const arb_poly_t src); +int arb_poly_get_unique_fmpz_poly(fmpz_poly_t z, const arb_poly_t x); /* Comparisons */ @@ -166,7 +166,7 @@ int arb_poly_overlaps(const arb_poly_t poly1, const arb_poly_t poly2); /* Bounds */ -void _arb_poly_majorant(arb_ptr res, arb_srcptr vec, slong len, slong prec); +void _arb_poly_majorant(arb_ptr res, arb_srcptr poly, slong len, slong prec); void arb_poly_majorant(arb_poly_t res, const arb_poly_t poly, slong prec); @@ -191,7 +191,7 @@ _arb_poly_add(arb_ptr res, arb_srcptr poly1, slong len1, void arb_poly_add(arb_poly_t res, const arb_poly_t poly1, const arb_poly_t poly2, slong prec); -void arb_poly_add_si(arb_poly_t res, const arb_poly_t poly, slong c, slong prec); +void arb_poly_add_si(arb_poly_t C, const arb_poly_t A, slong B, slong prec); void _arb_poly_sub(arb_ptr res, arb_srcptr poly1, slong len1, arb_srcptr poly2, slong len2, slong prec); @@ -288,7 +288,7 @@ _arb_poly_mul_monic(arb_ptr res, arb_srcptr poly1, slong len1, void _arb_poly_inv_series(arb_ptr Qinv, arb_srcptr Q, slong Qlen, slong len, slong prec); -void arb_poly_inv_series(arb_poly_t Qinv, const arb_poly_t Q, slong n, slong prec); +void arb_poly_inv_series(arb_poly_t Q, const arb_poly_t A, slong n, slong prec); void _arb_poly_div_series(arb_ptr Q, arb_srcptr A, slong Alen, arb_srcptr B, slong Blen, slong n, slong prec); @@ -334,7 +334,7 @@ void _arb_poly_tree_build(arb_ptr * tree, arb_srcptr roots, slong len, slong pre /* Composition */ -void _arb_poly_taylor_shift(arb_ptr poly, const arb_t c, slong n, slong prec); +void _arb_poly_taylor_shift(arb_ptr g, const arb_t c, slong n, slong prec); void arb_poly_taylor_shift(arb_poly_t g, const arb_poly_t f, const arb_t c, slong prec); void _arb_poly_compose(arb_ptr res, arb_srcptr poly1, slong len1, arb_srcptr poly2, slong len2, slong prec); void arb_poly_compose(arb_poly_t res, const arb_poly_t poly1, const arb_poly_t poly2, slong prec); @@ -348,19 +348,19 @@ void arb_poly_compose_series(arb_poly_t res, /* Reversion */ -void _arb_poly_revert_series(arb_ptr Qinv, arb_srcptr Q, slong Qlen, slong n, slong prec); -void arb_poly_revert_series(arb_poly_t Qinv, const arb_poly_t Q, slong n, slong prec); +void _arb_poly_revert_series(arb_ptr h, arb_srcptr f, slong flen, slong n, slong prec); +void arb_poly_revert_series(arb_poly_t h, const arb_poly_t f, slong n, slong prec); /* Evaluation and interpolation */ -void _arb_poly_evaluate_horner(arb_t res, arb_srcptr f, slong len, const arb_t a, slong prec); -void arb_poly_evaluate_horner(arb_t res, const arb_poly_t f, const arb_t a, slong prec); +void _arb_poly_evaluate_horner(arb_t y, arb_srcptr f, slong len, const arb_t x, slong prec); +void arb_poly_evaluate_horner(arb_t y, const arb_poly_t f, const arb_t x, slong prec); -void _arb_poly_evaluate_rectangular(arb_t y, arb_srcptr poly, slong len, const arb_t x, slong prec); -void arb_poly_evaluate_rectangular(arb_t res, const arb_poly_t f, const arb_t a, slong prec); +void _arb_poly_evaluate_rectangular(arb_t y, arb_srcptr f, slong len, const arb_t x, slong prec); +void arb_poly_evaluate_rectangular(arb_t y, const arb_poly_t f, const arb_t x, slong prec); -void _arb_poly_evaluate(arb_t res, arb_srcptr f, slong len, const arb_t a, slong prec); -void arb_poly_evaluate(arb_t res, const arb_poly_t f, const arb_t a, slong prec); +void _arb_poly_evaluate(arb_t y, arb_srcptr f, slong len, const arb_t x, slong prec); +void arb_poly_evaluate(arb_t y, const arb_poly_t f, const arb_t x, slong prec); void _arb_poly_evaluate2_horner(arb_t y, arb_t z, arb_srcptr f, slong len, const arb_t x, slong prec); void arb_poly_evaluate2_horner(arb_t y, arb_t z, const arb_poly_t f, const arb_t x, slong prec); @@ -528,49 +528,49 @@ void arb_poly_sinh_series(arb_poly_t s, const arb_poly_t h, slong n, slong prec) void _arb_poly_cosh_series(arb_ptr c, arb_srcptr h, slong hlen, slong n, slong prec); void arb_poly_cosh_series(arb_poly_t c, const arb_poly_t h, slong n, slong prec); -void _arb_poly_sin_cos_series(arb_ptr s, arb_ptr c, arb_srcptr h, slong hlen, slong len, slong prec); +void _arb_poly_sin_cos_series(arb_ptr s, arb_ptr c, arb_srcptr h, slong hlen, slong n, slong prec); void arb_poly_sin_cos_series(arb_poly_t s, arb_poly_t c, const arb_poly_t h, slong n, slong prec); -void _arb_poly_sin_cos_pi_series(arb_ptr s, arb_ptr c, arb_srcptr h, slong hlen, slong len, slong prec); +void _arb_poly_sin_cos_pi_series(arb_ptr s, arb_ptr c, arb_srcptr h, slong hlen, slong n, slong prec); void arb_poly_sin_cos_pi_series(arb_poly_t s, arb_poly_t c, const arb_poly_t h, slong n, slong prec); -void _arb_poly_sin_series(arb_ptr g, arb_srcptr h, slong hlen, slong n, slong prec); +void _arb_poly_sin_series(arb_ptr s, arb_srcptr h, slong hlen, slong n, slong prec); -void arb_poly_sin_series(arb_poly_t g, const arb_poly_t h, slong n, slong prec); +void arb_poly_sin_series(arb_poly_t s, const arb_poly_t h, slong n, slong prec); -void _arb_poly_cos_series(arb_ptr g, arb_srcptr h, slong hlen, slong n, slong prec); +void _arb_poly_cos_series(arb_ptr c, arb_srcptr h, slong hlen, slong n, slong prec); -void arb_poly_cos_series(arb_poly_t g, const arb_poly_t h, slong n, slong prec); +void arb_poly_cos_series(arb_poly_t c, const arb_poly_t h, slong n, slong prec); -void _arb_poly_sin_pi_series(arb_ptr g, arb_srcptr h, slong hlen, slong n, slong prec); +void _arb_poly_sin_pi_series(arb_ptr s, arb_srcptr h, slong hlen, slong n, slong prec); -void arb_poly_sin_pi_series(arb_poly_t g, const arb_poly_t h, slong n, slong prec); +void arb_poly_sin_pi_series(arb_poly_t s, const arb_poly_t h, slong n, slong prec); -void _arb_poly_cos_pi_series(arb_ptr g, arb_srcptr h, slong hlen, slong n, slong prec); +void _arb_poly_cos_pi_series(arb_ptr c, arb_srcptr h, slong hlen, slong n, slong prec); -void arb_poly_cos_pi_series(arb_poly_t g, const arb_poly_t h, slong n, slong prec); +void arb_poly_cos_pi_series(arb_poly_t c, const arb_poly_t h, slong n, slong prec); -void _arb_poly_cot_pi_series(arb_ptr g, arb_srcptr h, slong hlen, slong n, slong prec); +void _arb_poly_cot_pi_series(arb_ptr c, arb_srcptr h, slong hlen, slong n, slong prec); -void arb_poly_cot_pi_series(arb_poly_t g, const arb_poly_t h, slong n, slong prec); +void arb_poly_cot_pi_series(arb_poly_t c, const arb_poly_t h, slong n, slong prec); void _arb_poly_tan_series(arb_ptr g, arb_srcptr h, slong hlen, slong len, slong prec); void arb_poly_tan_series(arb_poly_t g, const arb_poly_t h, slong n, slong prec); -void _arb_poly_sinc_series(arb_ptr g, arb_srcptr h, slong hlen, slong n, slong prec); -void arb_poly_sinc_series(arb_poly_t g, const arb_poly_t h, slong n, slong prec); +void _arb_poly_sinc_series(arb_ptr s, arb_srcptr h, slong hlen, slong n, slong prec); +void arb_poly_sinc_series(arb_poly_t s, const arb_poly_t h, slong n, slong prec); -void _arb_poly_sinc_pi_series(arb_ptr g, arb_srcptr h, slong hlen, slong n, slong prec); -void arb_poly_sinc_pi_series(arb_poly_t g, const arb_poly_t h, slong n, slong prec); +void _arb_poly_sinc_pi_series(arb_ptr s, arb_srcptr h, slong hlen, slong n, slong prec); +void arb_poly_sinc_pi_series(arb_poly_t s, const arb_poly_t h, slong n, slong prec); -void _arb_poly_evaluate_acb_horner(acb_t res, arb_srcptr f, slong len, const acb_t x, slong prec); -void arb_poly_evaluate_acb_horner(acb_t res, const arb_poly_t f, const acb_t a, slong prec); +void _arb_poly_evaluate_acb_horner(acb_t y, arb_srcptr f, slong len, const acb_t x, slong prec); +void arb_poly_evaluate_acb_horner(acb_t y, const arb_poly_t f, const acb_t x, slong prec); -void _arb_poly_evaluate_acb_rectangular(acb_t y, arb_srcptr poly, slong len, const acb_t x, slong prec); -void arb_poly_evaluate_acb_rectangular(acb_t res, const arb_poly_t f, const acb_t a, slong prec); +void _arb_poly_evaluate_acb_rectangular(acb_t y, arb_srcptr f, slong len, const acb_t x, slong prec); +void arb_poly_evaluate_acb_rectangular(acb_t y, const arb_poly_t f, const acb_t x, slong prec); -void _arb_poly_evaluate_acb(acb_t res, arb_srcptr f, slong len, const acb_t x, slong prec); -void arb_poly_evaluate_acb(acb_t res, const arb_poly_t f, const acb_t a, slong prec); +void _arb_poly_evaluate_acb(acb_t y, arb_srcptr f, slong len, const acb_t x, slong prec); +void arb_poly_evaluate_acb(acb_t y, const arb_poly_t f, const acb_t x, slong prec); void _arb_poly_evaluate2_acb_horner(acb_t y, acb_t z, arb_srcptr f, slong len, const acb_t x, slong prec); void arb_poly_evaluate2_acb_horner(acb_t y, acb_t z, const arb_poly_t f, const acb_t x, slong prec); @@ -584,32 +584,32 @@ void arb_poly_evaluate2_acb(acb_t y, acb_t z, const arb_poly_t f, const acb_t x, void _arb_poly_lambertw_series(arb_ptr res, arb_srcptr z, slong zlen, int flags, slong len, slong prec); void arb_poly_lambertw_series(arb_poly_t res, const arb_poly_t z, int flags, slong len, slong prec); -void _arb_poly_gamma_series(arb_ptr res, arb_srcptr h, slong hlen, slong len, slong prec); -void arb_poly_gamma_series(arb_poly_t res, const arb_poly_t f, slong n, slong prec); +void _arb_poly_gamma_series(arb_ptr res, arb_srcptr h, slong hlen, slong n, slong prec); +void arb_poly_gamma_series(arb_poly_t res, const arb_poly_t h, slong n, slong prec); -void _arb_poly_rgamma_series(arb_ptr res, arb_srcptr h, slong hlen, slong len, slong prec); -void arb_poly_rgamma_series(arb_poly_t res, const arb_poly_t f, slong n, slong prec); +void _arb_poly_rgamma_series(arb_ptr res, arb_srcptr h, slong hlen, slong n, slong prec); +void arb_poly_rgamma_series(arb_poly_t res, const arb_poly_t h, slong n, slong prec); -void _arb_poly_lgamma_series(arb_ptr res, arb_srcptr h, slong hlen, slong len, slong prec); -void arb_poly_lgamma_series(arb_poly_t res, const arb_poly_t f, slong n, slong prec); +void _arb_poly_lgamma_series(arb_ptr res, arb_srcptr h, slong hlen, slong n, slong prec); +void arb_poly_lgamma_series(arb_poly_t res, const arb_poly_t h, slong n, slong prec); -void _arb_poly_digamma_series(arb_ptr res, arb_srcptr h, slong hlen, slong len, slong prec); -void arb_poly_digamma_series(arb_poly_t res, const arb_poly_t f, slong n, slong prec); +void _arb_poly_digamma_series(arb_ptr res, arb_srcptr h, slong hlen, slong n, slong prec); +void arb_poly_digamma_series(arb_poly_t res, const arb_poly_t h, slong n, slong prec); void _arb_poly_rising_ui_series(arb_ptr res, arb_srcptr f, slong flen, ulong r, slong trunc, slong prec); void arb_poly_rising_ui_series(arb_poly_t res, const arb_poly_t f, ulong r, slong trunc, slong prec); void _arb_poly_zeta_series(arb_ptr res, arb_srcptr h, slong hlen, const arb_t a, int deflate, slong len, slong prec); -void arb_poly_zeta_series(arb_poly_t res, const arb_poly_t f, const arb_t a, int deflate, slong n, slong prec); +void arb_poly_zeta_series(arb_poly_t res, const arb_poly_t s, const arb_t a, int deflate, slong n, slong prec); -void _arb_poly_riemann_siegel_theta_series(arb_ptr res, arb_srcptr h, slong hlen, slong len, slong prec); +void _arb_poly_riemann_siegel_theta_series(arb_ptr res, arb_srcptr h, slong hlen, slong n, slong prec); void arb_poly_riemann_siegel_theta_series(arb_poly_t res, const arb_poly_t h, slong n, slong prec); -void _arb_poly_riemann_siegel_z_series(arb_ptr res, arb_srcptr h, slong hlen, slong len, slong prec); +void _arb_poly_riemann_siegel_z_series(arb_ptr res, arb_srcptr h, slong hlen, slong n, slong prec); void arb_poly_riemann_siegel_z_series(arb_poly_t res, const arb_poly_t h, slong n, slong prec); slong _arb_poly_swinnerton_dyer_ui_prec(ulong n); -void _arb_poly_swinnerton_dyer_ui(arb_ptr T, ulong n, slong trunc, slong prec); +void _arb_poly_swinnerton_dyer_ui(arb_ptr poly, ulong n, slong trunc, slong prec); void arb_poly_swinnerton_dyer_ui(arb_poly_t poly, ulong n, slong prec); /* Root-finding */ diff --git a/src/arf.h b/src/arf.h index 201d21d02b..74dab7103a 100644 --- a/src/arf.h +++ b/src/arf.h @@ -326,7 +326,7 @@ arf_swap(arf_t y, arf_t x) FLINT_SWAP(arf_struct, *x, *y); } -void arf_set(arf_t y, const arf_t x); +void arf_set(arf_t res, const arf_t x); ARF_INLINE void arf_neg(arf_t y, const arf_t x) @@ -473,7 +473,7 @@ arf_set_fmpz(arf_t y, const fmpz_t x) arf_set_mpz(y, COEFF_TO_PTR(*x)); } -int _arf_set_round_ui(arf_t x, ulong v, int sgnbit, slong prec, arf_rnd_t rnd); +int _arf_set_round_ui(arf_t z, ulong x, int sgnbit, slong prec, arf_rnd_t rnd); int _arf_set_round_uiui(arf_t z, slong * fix, mp_limb_t hi, mp_limb_t lo, int sgnbit, slong prec, arf_rnd_t rnd); @@ -522,9 +522,9 @@ arf_set_round_fmpz(arf_t y, const fmpz_t x, slong prec, arf_rnd_t rnd) return arf_set_round_mpz(y, COEFF_TO_PTR(*x), prec, rnd); } -int arf_set_round(arf_t y, const arf_t x, slong prec, arf_rnd_t rnd); +int arf_set_round(arf_t res, const arf_t x, slong prec, arf_rnd_t rnd); -int arf_neg_round(arf_t y, const arf_t x, slong prec, arf_rnd_t rnd); +int arf_neg_round(arf_t res, const arf_t x, slong prec, arf_rnd_t rnd); #ifdef __MPFR_H int arf_get_mpfr(mpfr_t x, const arf_t y, mpfr_rnd_t rnd); @@ -668,22 +668,22 @@ arf_abs_bound_le_2exp_fmpz(fmpz_t b, const arf_t x) slong arf_abs_bound_lt_2exp_si(const arf_t x); -void arf_frexp(arf_t man, fmpz_t exp, const arf_t x); +void arf_frexp(arf_t m, fmpz_t e, const arf_t x); -void arf_get_fmpz_2exp(fmpz_t man, fmpz_t exp, const arf_t x); +void arf_get_fmpz_2exp(fmpz_t m, fmpz_t e, const arf_t x); -int _arf_get_integer_mpn(mp_ptr y, mp_srcptr x, mp_size_t xn, slong exp); +int _arf_get_integer_mpn(mp_ptr y, mp_srcptr xp, mp_size_t xn, slong exp); int _arf_set_mpn_fixed(arf_t z, mp_srcptr xp, mp_size_t xn, mp_size_t fixn, int negative, slong prec, arf_rnd_t rnd); -int arf_get_fmpz(fmpz_t z, const arf_t x, arf_rnd_t rnd); +int arf_get_fmpz(fmpz_t res, const arf_t x, arf_rnd_t rnd); slong arf_get_si(const arf_t x, arf_rnd_t rnd); -int arf_get_fmpz_fixed_fmpz(fmpz_t y, const arf_t x, const fmpz_t e); +int arf_get_fmpz_fixed_fmpz(fmpz_t res, const arf_t x, const fmpz_t e); -int arf_get_fmpz_fixed_si(fmpz_t y, const arf_t x, slong e); +int arf_get_fmpz_fixed_si(fmpz_t res, const arf_t x, slong e); ARF_INLINE void arf_set_fmpz_2exp(arf_t x, const fmpz_t man, const fmpz_t exp) @@ -693,9 +693,9 @@ arf_set_fmpz_2exp(arf_t x, const fmpz_t man, const fmpz_t exp) fmpz_add_inline(ARF_EXPREF(x), ARF_EXPREF(x), exp); } -void arf_floor(arf_t z, const arf_t x); +void arf_floor(arf_t res, const arf_t x); -void arf_ceil(arf_t z, const arf_t x); +void arf_ceil(arf_t res, const arf_t x); void arf_debug(const arf_t x); @@ -707,15 +707,15 @@ void arf_fprintd(FILE * file, const arf_t y, slong d); #endif void arf_print(const arf_t x); -void arf_printd(const arf_t y, slong d); +void arf_printd(const arf_t x, slong d); -void arf_randtest(arf_t x, flint_rand_t state, slong bits, slong mag_bits); +void arf_randtest(arf_t res, flint_rand_t state, slong bits, slong mag_bits); -void arf_randtest_not_zero(arf_t x, flint_rand_t state, slong bits, slong mag_bits); +void arf_randtest_not_zero(arf_t res, flint_rand_t state, slong bits, slong mag_bits); -void arf_randtest_special(arf_t x, flint_rand_t state, slong bits, slong mag_bits); +void arf_randtest_special(arf_t res, flint_rand_t state, slong bits, slong mag_bits); -void arf_urandom(arf_t x, flint_rand_t state, slong bits, arf_rnd_t rnd); +void arf_urandom(arf_t res, flint_rand_t state, slong bits, arf_rnd_t rnd); #define MUL_MPFR_MIN_LIMBS 25 @@ -935,7 +935,7 @@ arf_submul_fmpz(arf_ptr z, arf_srcptr x, const fmpz_t y, slong prec, arf_rnd_t r int arf_fma(arf_ptr res, arf_srcptr x, arf_srcptr y, arf_srcptr z, slong prec, arf_rnd_t rnd); -int arf_sosq(arf_t z, const arf_t x, const arf_t y, slong prec, arf_rnd_t rnd); +int arf_sosq(arf_t res, const arf_t x, const arf_t y, slong prec, arf_rnd_t rnd); int arf_div(arf_ptr z, arf_srcptr x, arf_srcptr y, slong prec, arf_rnd_t rnd); @@ -1012,9 +1012,9 @@ arf_fmpz_div_fmpz(arf_ptr z, const fmpz_t x, const fmpz_t y, slong prec, arf_rnd int arf_sqrt(arf_ptr z, arf_srcptr x, slong prec, arf_rnd_t rnd); -int arf_sqrt_ui(arf_t z, ulong x, slong prec, arf_rnd_t rnd); +int arf_sqrt_ui(arf_t res, ulong x, slong prec, arf_rnd_t rnd); -int arf_sqrt_fmpz(arf_t z, const fmpz_t x, slong prec, arf_rnd_t rnd); +int arf_sqrt_fmpz(arf_t res, const fmpz_t x, slong prec, arf_rnd_t rnd); int arf_rsqrt(arf_ptr z, arf_srcptr x, slong prec, arf_rnd_t rnd); @@ -1022,9 +1022,9 @@ int arf_root(arf_ptr z, arf_srcptr x, ulong k, slong prec, arf_rnd_t rnd); /* Magnitude bounds */ -void arf_get_mag(mag_t y, const arf_t x); +void arf_get_mag(mag_t res, const arf_t x); -void arf_get_mag_lower(mag_t y, const arf_t x); +void arf_get_mag_lower(mag_t res, const arf_t x); ARF_INLINE void arf_set_mag(arf_t y, const mag_t x) @@ -1115,7 +1115,7 @@ arf_mag_set_ulp(mag_t z, const arf_t y, slong prec) } } -void arf_get_fmpq(fmpq_t y, const arf_t x); +void arf_get_fmpq(fmpq_t res, const arf_t x); ARF_INLINE int arf_set_fmpq(arf_t y, const fmpq_t x, slong prec, arf_rnd_t rnd) @@ -1135,10 +1135,10 @@ int arf_complex_mul_fallback(arf_t e, arf_t f, int arf_complex_sqr(arf_t e, arf_t f, const arf_t a, const arf_t b, slong prec, arf_rnd_t rnd); -int arf_sum(arf_t s, arf_srcptr terms, slong len, slong prec, arf_rnd_t rnd); +int arf_sum(arf_t res, arf_srcptr terms, slong len, slong prec, arf_rnd_t rnd); double arf_get_d(const arf_t x, arf_rnd_t rnd); -void arf_set_d(arf_t x, double v); +void arf_set_d(arf_t res, double x); ARF_INLINE slong arf_allocated_bytes(const arf_t x) diff --git a/src/arith.h b/src/arith.h index 0e125ec1fd..c33b67d413 100644 --- a/src/arith.h +++ b/src/arith.h @@ -80,7 +80,7 @@ mp_limb_t arith_bell_number_nmod(ulong n, nmod_t mod); void arith_bell_number_nmod_vec(mp_ptr b, slong n, nmod_t mod); void arith_bell_number_nmod_vec_recursive(mp_ptr b, slong n, nmod_t mod); int arith_bell_number_nmod_vec_series(mp_ptr b, slong n, nmod_t mod); -void arith_bell_number_nmod_vec_ogf(mp_ptr res, slong len, nmod_t mod); +void arith_bell_number_nmod_vec_ogf(mp_ptr b, slong n, nmod_t mod); /* Euler numbers *************************************************************/ diff --git a/src/bernoulli.h b/src/bernoulli.h index 6a4448b223..85498e1ea7 100644 --- a/src/bernoulli.h +++ b/src/bernoulli.h @@ -83,7 +83,7 @@ bernoulli_rev_struct; typedef bernoulli_rev_struct bernoulli_rev_t[1]; -void bernoulli_rev_init(bernoulli_rev_t iter, ulong nmax); +void bernoulli_rev_init(bernoulli_rev_t iter, ulong n); void bernoulli_rev_next(fmpz_t numer, fmpz_t denom, bernoulli_rev_t iter); @@ -100,7 +100,7 @@ void bernoulli_fmpq_vec_no_cache(fmpq * res, ulong a, slong num); slong bernoulli_bound_2exp_si(ulong n); -ulong bernoulli_mod_p_harvey(ulong k, ulong p); +ulong bernoulli_mod_p_harvey(ulong n, ulong p); void _bernoulli_fmpq_ui_multi_mod(fmpz_t num, fmpz_t den, ulong n, double alpha); void _bernoulli_fmpq_ui_zeta(fmpz_t num, fmpz_t den, ulong n); diff --git a/src/bool_mat.h b/src/bool_mat.h index bf12435a56..21987dd2d7 100644 --- a/src/bool_mat.h +++ b/src/bool_mat.h @@ -90,13 +90,13 @@ int bool_mat_any(const bool_mat_t mat); int bool_mat_all(const bool_mat_t mat); -int bool_mat_is_diagonal(const bool_mat_t mat); +int bool_mat_is_diagonal(const bool_mat_t A); -int bool_mat_is_lower_triangular(const bool_mat_t mat); +int bool_mat_is_lower_triangular(const bool_mat_t A); int bool_mat_is_transitive(const bool_mat_t mat); -int bool_mat_is_nilpotent(const bool_mat_t mat); +int bool_mat_is_nilpotent(const bool_mat_t A); BOOL_MAT_INLINE int bool_mat_is_empty(const bool_mat_t mat) @@ -116,17 +116,17 @@ void bool_mat_zero(bool_mat_t mat); void bool_mat_one(bool_mat_t mat); -void bool_mat_directed_path(bool_mat_t mat); +void bool_mat_directed_path(bool_mat_t A); -void bool_mat_directed_cycle(bool_mat_t mat); +void bool_mat_directed_cycle(bool_mat_t A); /* Transpose */ -void bool_mat_transpose(bool_mat_t mat1, const bool_mat_t mat2); +void bool_mat_transpose(bool_mat_t dest, const bool_mat_t src); /* Arithmetic */ -void bool_mat_complement(bool_mat_t mat1, const bool_mat_t mat2); +void bool_mat_complement(bool_mat_t B, const bool_mat_t A); void bool_mat_add(bool_mat_t res, const bool_mat_t mat1, const bool_mat_t mat2); @@ -146,9 +146,9 @@ bool_mat_sqr(bool_mat_t B, const bool_mat_t A) int bool_mat_trace(const bool_mat_t mat); -slong bool_mat_nilpotency_degree(const bool_mat_t mat); +slong bool_mat_nilpotency_degree(const bool_mat_t A); -void bool_mat_transitive_closure(bool_mat_t dest, const bool_mat_t src); +void bool_mat_transitive_closure(bool_mat_t B, const bool_mat_t A); slong bool_mat_get_strongly_connected_components(slong *partition, const bool_mat_t A); diff --git a/src/ca.h b/src/ca.h index 08b3a175dc..0772bd64bf 100644 --- a/src/ca.h +++ b/src/ca.h @@ -269,7 +269,7 @@ ca_field_ptr _ca_ctx_get_field_fxy(ca_ctx_t ctx, calcium_func_code func, const c void ca_init(ca_t x, ca_ctx_t ctx); void ca_clear(ca_t x, ca_ctx_t ctx); void ca_swap(ca_t x, ca_t y, ca_ctx_t ctx); -void _ca_make_field_element(ca_t x, ca_field_srcptr field, ca_ctx_t ctx); +void _ca_make_field_element(ca_t x, ca_field_srcptr new_index, ca_ctx_t ctx); CA_INLINE void _ca_make_fmpq(ca_t x, ca_ctx_t ctx) @@ -297,31 +297,31 @@ _ca_function_fxy(ca_t res, calcium_func_code func, const ca_t x, const ca_t y, c void ca_set(ca_t res, const ca_t x, ca_ctx_t ctx); void ca_transfer(ca_t res, ca_ctx_t res_ctx, const ca_t src, ca_ctx_t src_ctx); -void ca_zero(ca_t x, ca_ctx_t ctx); -void ca_one(ca_t x, ca_ctx_t ctx); -void ca_neg_one(ca_t x, ca_ctx_t ctx); +void ca_zero(ca_t res, ca_ctx_t ctx); +void ca_one(ca_t res, ca_ctx_t ctx); +void ca_neg_one(ca_t res, ca_ctx_t ctx); -void ca_set_si(ca_t x, slong v, ca_ctx_t ctx); -void ca_set_ui(ca_t x, ulong v, ca_ctx_t ctx); -void ca_set_fmpz(ca_t x, const fmpz_t v, ca_ctx_t ctx); -void ca_set_fmpq(ca_t x, const fmpq_t v, ca_ctx_t ctx); +void ca_set_si(ca_t res, slong v, ca_ctx_t ctx); +void ca_set_ui(ca_t res, ulong v, ca_ctx_t ctx); +void ca_set_fmpz(ca_t res, const fmpz_t v, ca_ctx_t ctx); +void ca_set_fmpq(ca_t res, const fmpq_t v, ca_ctx_t ctx); void ca_set_d(ca_t res, double x, ca_ctx_t ctx); void ca_set_d_d(ca_t res, double x, double y, ca_ctx_t ctx); -void ca_i(ca_t x, ca_ctx_t ctx); -void ca_neg_i(ca_t x, ca_ctx_t ctx); +void ca_i(ca_t res, ca_ctx_t ctx); +void ca_neg_i(ca_t res, ca_ctx_t ctx); void ca_pi(ca_t res, ca_ctx_t ctx); void ca_pi_i(ca_t res, ca_ctx_t ctx); void ca_euler(ca_t res, ca_ctx_t ctx); -void ca_unknown(ca_t x, ca_ctx_t ctx); +void ca_unknown(ca_t res, ca_ctx_t ctx); -void ca_undefined(ca_t x, ca_ctx_t ctx); -void ca_uinf(ca_t x, ca_ctx_t ctx); -void ca_pos_inf(ca_t x, ca_ctx_t ctx); -void ca_neg_inf(ca_t x, ca_ctx_t ctx); -void ca_pos_i_inf(ca_t x, ca_ctx_t ctx); -void ca_neg_i_inf(ca_t x, ca_ctx_t ctx); +void ca_undefined(ca_t res, ca_ctx_t ctx); +void ca_uinf(ca_t res, ca_ctx_t ctx); +void ca_pos_inf(ca_t res, ca_ctx_t ctx); +void ca_neg_inf(ca_t res, ca_ctx_t ctx); +void ca_pos_i_inf(ca_t res, ca_ctx_t ctx); +void ca_neg_i_inf(ca_t res, ca_ctx_t ctx); void ca_set_qqbar(ca_t res, const qqbar_t x, ca_ctx_t ctx); int ca_can_evaluate_qqbar(const ca_t x, ca_ctx_t ctx); diff --git a/src/ca_field.h b/src/ca_field.h index c6e8e1b09e..d9cc40927d 100644 --- a/src/ca_field.h +++ b/src/ca_field.h @@ -32,7 +32,7 @@ void ca_field_init_fxy(ca_field_t K, calcium_func_code func, const ca_t x, const void ca_field_init_multi(ca_field_t K, slong len, ca_ctx_t ctx); void ca_field_clear(ca_field_t K, ca_ctx_t ctx); -void ca_field_set_ext(ca_field_t K, slong i, ca_ext_srcptr x, ca_ctx_t ctx); +void ca_field_set_ext(ca_field_t K, slong i, ca_ext_srcptr x_index, ca_ctx_t ctx); void ca_field_print(const ca_field_t K, ca_ctx_t ctx); diff --git a/src/ca_mat.h b/src/ca_mat.h index 077752cc86..319845eacd 100644 --- a/src/ca_mat.h +++ b/src/ca_mat.h @@ -88,13 +88,13 @@ ca_mat_is_square(const ca_mat_t mat) void ca_mat_set(ca_mat_t dest, const ca_mat_t src, ca_ctx_t ctx); void ca_mat_set_fmpz_mat(ca_mat_t dest, const fmpz_mat_t src, ca_ctx_t ctx); void ca_mat_set_fmpq_mat(ca_mat_t dest, const fmpq_mat_t src, ca_ctx_t ctx); -void ca_mat_set_ca(ca_mat_t y, const ca_t x, ca_ctx_t ctx); +void ca_mat_set_ca(ca_mat_t mat, const ca_t c, ca_ctx_t ctx); void ca_mat_transfer(ca_mat_t res, ca_ctx_t res_ctx, const ca_mat_t src, ca_ctx_t src_ctx); /* Random generation */ -void ca_mat_randtest(ca_mat_t mat, flint_rand_t state, slong len, slong bits, ca_ctx_t ctx); +void ca_mat_randtest(ca_mat_t mat, flint_rand_t state, slong depth, slong bits, ca_ctx_t ctx); void ca_mat_randtest_rational(ca_mat_t mat, flint_rand_t state, slong bits, ca_ctx_t ctx); void ca_mat_randops(ca_mat_t mat, flint_rand_t state, slong count, ca_ctx_t ctx); @@ -111,7 +111,7 @@ void ca_mat_ones(ca_mat_t mat, ca_ctx_t ctx); void ca_mat_pascal(ca_mat_t mat, int triangular, ca_ctx_t ctx); void ca_mat_stirling(ca_mat_t mat, int kind, ca_ctx_t ctx); void ca_mat_hilbert(ca_mat_t mat, ca_ctx_t ctx); -void ca_mat_dft(ca_mat_t res, int type, ca_ctx_t ctx); +void ca_mat_dft(ca_mat_t mat, int type, ca_ctx_t ctx); /* Comparisons and properties */ @@ -121,25 +121,25 @@ truth_t ca_mat_check_is_one(const ca_mat_t A, ca_ctx_t ctx); /* Conjugate and transpose */ -void ca_mat_transpose(ca_mat_t B, const ca_mat_t A, ca_ctx_t ctx); -void ca_mat_conj(ca_mat_t B, const ca_mat_t A, ca_ctx_t ctx); -void ca_mat_conj_transpose(ca_mat_t mat1, const ca_mat_t mat2, ca_ctx_t ctx); +void ca_mat_transpose(ca_mat_t res, const ca_mat_t A, ca_ctx_t ctx); +void ca_mat_conj(ca_mat_t res, const ca_mat_t A, ca_ctx_t ctx); +void ca_mat_conj_transpose(ca_mat_t res, const ca_mat_t A, ca_ctx_t ctx); /* Arithmetic */ -void ca_mat_add_ca(ca_mat_t y, const ca_mat_t a, const ca_t x, ca_ctx_t ctx); -void ca_mat_sub_ca(ca_mat_t y, const ca_mat_t a, const ca_t x, ca_ctx_t ctx); -void ca_mat_addmul_ca(ca_mat_t y, const ca_mat_t a, const ca_t x, ca_ctx_t ctx); -void ca_mat_submul_ca(ca_mat_t y, const ca_mat_t a, const ca_t x, ca_ctx_t ctx); +void ca_mat_add_ca(ca_mat_t B, const ca_mat_t A, const ca_t c, ca_ctx_t ctx); +void ca_mat_sub_ca(ca_mat_t B, const ca_mat_t A, const ca_t c, ca_ctx_t ctx); +void ca_mat_addmul_ca(ca_mat_t B, const ca_mat_t A, const ca_t c, ca_ctx_t ctx); +void ca_mat_submul_ca(ca_mat_t B, const ca_mat_t A, const ca_t c, ca_ctx_t ctx); -void ca_mat_neg(ca_mat_t dest, const ca_mat_t src, ca_ctx_t ctx); -void ca_mat_add(ca_mat_t res, const ca_mat_t mat1, const ca_mat_t mat2, ca_ctx_t ctx); -void ca_mat_sub(ca_mat_t res, const ca_mat_t mat1, const ca_mat_t mat2, ca_ctx_t ctx); +void ca_mat_neg(ca_mat_t res, const ca_mat_t A, ca_ctx_t ctx); +void ca_mat_add(ca_mat_t res, const ca_mat_t A, const ca_mat_t B, ca_ctx_t ctx); +void ca_mat_sub(ca_mat_t res, const ca_mat_t A, const ca_mat_t B, ca_ctx_t ctx); -void ca_mat_mul(ca_mat_t C, const ca_mat_t A, const ca_mat_t B, ca_ctx_t ctx); +void ca_mat_mul(ca_mat_t res, const ca_mat_t A, const ca_mat_t B, ca_ctx_t ctx); -void ca_mat_mul_classical(ca_mat_t C, const ca_mat_t A, const ca_mat_t B, ca_ctx_t ctx); -void ca_mat_mul_same_nf(ca_mat_t C, const ca_mat_t A, const ca_mat_t B, ca_field_t K, ca_ctx_t ctx); +void ca_mat_mul_classical(ca_mat_t res, const ca_mat_t A, const ca_mat_t B, ca_ctx_t ctx); +void ca_mat_mul_same_nf(ca_mat_t res, const ca_mat_t A, const ca_mat_t B, ca_field_t K, ca_ctx_t ctx); CA_MAT_INLINE void ca_mat_mul_si(ca_mat_t B, const ca_mat_t A, slong c, ca_ctx_t ctx) @@ -231,8 +231,8 @@ void ca_mat_pow_ui_binexp(ca_mat_t B, const ca_mat_t A, ulong exp, ca_ctx_t ctx) /* Polynomial evaluation */ -void _ca_mat_ca_poly_evaluate(ca_mat_t y, ca_srcptr poly, slong len, const ca_mat_t x, ca_ctx_t ctx); -void ca_mat_ca_poly_evaluate(ca_mat_t res, const ca_poly_t f, const ca_mat_t a, ca_ctx_t ctx); +void _ca_mat_ca_poly_evaluate(ca_mat_t res, ca_srcptr poly, slong len, const ca_mat_t A, ca_ctx_t ctx); +void ca_mat_ca_poly_evaluate(ca_mat_t res, const ca_poly_t poly, const ca_mat_t A, ca_ctx_t ctx); /* Trace */ @@ -308,7 +308,7 @@ void ca_mat_adjugate(ca_mat_t adj, ca_t det, const ca_mat_t A, ca_ctx_t ctx); void _ca_mat_charpoly_berkowitz(ca_ptr cp, const ca_mat_t mat, ca_ctx_t ctx); void ca_mat_charpoly_berkowitz(ca_poly_t cp, const ca_mat_t mat, ca_ctx_t ctx); -int _ca_mat_charpoly_danilevsky(ca_ptr p, const ca_mat_t A, ca_ctx_t ctx); +int _ca_mat_charpoly_danilevsky(ca_ptr cp, const ca_mat_t mat, ca_ctx_t ctx); int ca_mat_charpoly_danilevsky(ca_poly_t cp, const ca_mat_t mat, ca_ctx_t ctx); void _ca_mat_charpoly(ca_ptr cp, const ca_mat_t mat, ca_ctx_t ctx); @@ -316,7 +316,7 @@ void ca_mat_charpoly(ca_poly_t cp, const ca_mat_t mat, ca_ctx_t ctx); -int ca_mat_companion(ca_mat_t A, const ca_poly_t poly, ca_ctx_t ctx); +int ca_mat_companion(ca_mat_t mat, const ca_poly_t poly, ca_ctx_t ctx); /* Eigenvalues and eigenvectors */ diff --git a/src/ca_poly.h b/src/ca_poly.h index c4b88a3f71..5bf785ac11 100644 --- a/src/ca_poly.h +++ b/src/ca_poly.h @@ -72,8 +72,8 @@ ca_poly_swap(ca_poly_t poly1, ca_poly_t poly2, ca_ctx_t ctx) /* Assignment and simple values */ -void ca_poly_set_ca(ca_poly_t poly, const ca_t x, ca_ctx_t ctx); -void ca_poly_set_si(ca_poly_t poly, slong x, ca_ctx_t ctx); +void ca_poly_set_ca(ca_poly_t poly, const ca_t c, ca_ctx_t ctx); +void ca_poly_set_si(ca_poly_t poly, slong c, ca_ctx_t ctx); CA_POLY_INLINE void ca_poly_zero(ca_poly_t poly, ca_ctx_t ctx) @@ -146,7 +146,7 @@ void ca_poly_add(ca_poly_t res, const ca_poly_t poly1, const ca_poly_t poly2, ca void _ca_poly_sub(ca_ptr res, ca_srcptr poly1, slong len1, ca_srcptr poly2, slong len2, ca_ctx_t ctx); void ca_poly_sub(ca_poly_t res, const ca_poly_t poly1, const ca_poly_t poly2, ca_ctx_t ctx); -void _ca_poly_mul(ca_ptr C, ca_srcptr A, slong lenA, ca_srcptr B, slong lenB, ca_ctx_t ctx); +void _ca_poly_mul(ca_ptr res, ca_srcptr poly1, slong len1, ca_srcptr poly2, slong len2, ca_ctx_t ctx); void ca_poly_mul(ca_poly_t res, const ca_poly_t poly1, const ca_poly_t poly2, ca_ctx_t ctx); CA_POLY_INLINE void @@ -180,7 +180,7 @@ ca_poly_div_fmpz(ca_poly_t res, const ca_poly_t poly, const fmpz_t c, ca_ctx_t c void _ca_poly_mullow_same_nf(ca_ptr C, ca_srcptr A, slong Alen, ca_srcptr B, slong Blen, slong len, ca_field_t K, ca_ctx_t ctx); -void _ca_poly_mullow(ca_ptr C, ca_srcptr A, slong lenA, ca_srcptr B, slong lenB, slong n, ca_ctx_t ctx); +void _ca_poly_mullow(ca_ptr C, ca_srcptr poly1, slong len1, ca_srcptr poly2, slong len2, slong n, ca_ctx_t ctx); void ca_poly_mullow(ca_poly_t res, const ca_poly_t poly1, const ca_poly_t poly2, slong n, ca_ctx_t ctx); void _ca_poly_divrem_basecase(ca_ptr Q, ca_ptr R, ca_srcptr A, slong lenA, ca_srcptr B, slong lenB, const ca_t invB, ca_ctx_t ctx); @@ -220,11 +220,11 @@ void ca_poly_integral(ca_poly_t res, const ca_poly_t poly, ca_ctx_t ctx); /* Greatest common divisor */ -slong _ca_poly_gcd_euclidean(ca_ptr G, ca_srcptr A, slong lenA, ca_srcptr B, slong lenB, ca_ctx_t ctx); -int ca_poly_gcd_euclidean(ca_poly_t G, const ca_poly_t A, const ca_poly_t B, ca_ctx_t ctx); +slong _ca_poly_gcd_euclidean(ca_ptr res, ca_srcptr A, slong lenA, ca_srcptr B, slong lenB, ca_ctx_t ctx); +int ca_poly_gcd_euclidean(ca_poly_t res, const ca_poly_t A, const ca_poly_t B, ca_ctx_t ctx); -slong _ca_poly_gcd(ca_ptr G, ca_srcptr A, slong lenA, ca_srcptr B, slong lenB, ca_ctx_t ctx); -int ca_poly_gcd(ca_poly_t G, const ca_poly_t A, const ca_poly_t B, ca_ctx_t ctx); +slong _ca_poly_gcd(ca_ptr res, ca_srcptr A, slong lenA, ca_srcptr B, slong lenB, ca_ctx_t ctx); +int ca_poly_gcd(ca_poly_t res, const ca_poly_t A, const ca_poly_t g, ca_ctx_t ctx); /* Power series division */ @@ -253,7 +253,7 @@ void ca_poly_vec_set_length(ca_poly_vec_t vec, slong len, ca_ctx_t ctx); void _ca_poly_vec_clear(ca_poly_struct * v, slong len, ca_ctx_t ctx); void ca_poly_vec_clear(ca_poly_vec_t vec, ca_ctx_t ctx); -void ca_poly_vec_append(ca_poly_vec_t vec, const ca_poly_t f, ca_ctx_t ctx); +void ca_poly_vec_append(ca_poly_vec_t vec, const ca_poly_t poly, ca_ctx_t ctx); /* Roots and factorization */ diff --git a/src/ca_vec.h b/src/ca_vec.h index 6b4669ac19..7c965a35da 100644 --- a/src/ca_vec.h +++ b/src/ca_vec.h @@ -49,7 +49,7 @@ ca_vec_entry_ptr(ca_vec_t vec, slong i) ca_ptr _ca_vec_init(slong len, ca_ctx_t ctx); void ca_vec_init(ca_vec_t vec, slong len, ca_ctx_t ctx); -void _ca_vec_clear(ca_ptr v, slong len, ca_ctx_t ctx); +void _ca_vec_clear(ca_ptr vec, slong len, ca_ctx_t ctx); void ca_vec_clear(ca_vec_t vec, ca_ctx_t ctx); void _ca_vec_swap(ca_ptr vec1, ca_ptr vec2, slong len, ca_ctx_t ctx); @@ -69,7 +69,7 @@ slong ca_vec_length(const ca_vec_t vec, ca_ctx_t ctx) } void _ca_vec_fit_length(ca_vec_t vec, slong len, ca_ctx_t ctx); -void ca_vec_set_length(ca_vec_t res, slong len, ca_ctx_t ctx); +void ca_vec_set_length(ca_vec_t vec, slong len, ca_ctx_t ctx); /* Assignment */ @@ -100,7 +100,7 @@ void _ca_vec_undefined(ca_ptr vec, slong len, ca_ctx_t ctx) /* Input and output */ void ca_vec_print(const ca_vec_t vec, ca_ctx_t ctx); -void ca_vec_printn(const ca_vec_t vec, slong digits, ca_ctx_t ctx); +void ca_vec_printn(const ca_vec_t poly, slong digits, ca_ctx_t ctx); /* List operations */ @@ -121,8 +121,8 @@ void _ca_vec_add(ca_ptr res, ca_srcptr vec1, ca_srcptr vec2, slong len, ca_ctx_t void _ca_vec_sub(ca_ptr res, ca_srcptr vec1, ca_srcptr vec2, slong len, ca_ctx_t ctx); void _ca_vec_scalar_mul_ca(ca_ptr res, ca_srcptr src, slong len, const ca_t c, ca_ctx_t ctx); void _ca_vec_scalar_div_ca(ca_ptr res, ca_srcptr src, slong len, const ca_t c, ca_ctx_t ctx); -void _ca_vec_scalar_addmul_ca(ca_ptr res, ca_srcptr vec, slong len, const ca_t c, ca_ctx_t ctx); -void _ca_vec_scalar_submul_ca(ca_ptr res, ca_srcptr vec, slong len, const ca_t c, ca_ctx_t ctx); +void _ca_vec_scalar_addmul_ca(ca_ptr res, ca_srcptr src, slong len, const ca_t c, ca_ctx_t ctx); +void _ca_vec_scalar_submul_ca(ca_ptr res, ca_srcptr src, slong len, const ca_t c, ca_ctx_t ctx); /* Comparisons and predicates */ diff --git a/src/calcium.h b/src/calcium.h index 6b8088d65b..c79f2019ba 100644 --- a/src/calcium.h +++ b/src/calcium.h @@ -54,7 +54,7 @@ void calcium_stream_init_str(calcium_stream_t out) void calcium_write(calcium_stream_t out, const char * s); void calcium_write_si(calcium_stream_t out, slong x); -void calcium_write_fmpz(calcium_stream_t out, const fmpz_t c); +void calcium_write_fmpz(calcium_stream_t out, const fmpz_t x); void calcium_write_acb(calcium_stream_t out, const acb_t z, slong digits, ulong flags); CALCIUM_INLINE diff --git a/src/dirichlet.h b/src/dirichlet.h index 169366ffb3..09d150632a 100644 --- a/src/dirichlet.h +++ b/src/dirichlet.h @@ -87,9 +87,9 @@ dirichlet_char_struct; typedef dirichlet_char_struct dirichlet_char_t[1]; -void dirichlet_char_init(dirichlet_char_t x, const dirichlet_group_t G); -void dirichlet_char_clear(dirichlet_char_t x); -void dirichlet_char_print(const dirichlet_group_t G, const dirichlet_char_t x); +void dirichlet_char_init(dirichlet_char_t chi, const dirichlet_group_t G); +void dirichlet_char_clear(dirichlet_char_t chi); +void dirichlet_char_print(const dirichlet_group_t G, const dirichlet_char_t chi); DIRICHLET_INLINE void dirichlet_char_set(dirichlet_char_t x, const dirichlet_group_t G, const dirichlet_char_t y) @@ -130,16 +130,16 @@ void dirichlet_char_first_primitive(dirichlet_char_t x, const dirichlet_group_t int dirichlet_char_next(dirichlet_char_t x, const dirichlet_group_t G); int dirichlet_char_next_primitive(dirichlet_char_t x, const dirichlet_group_t G); -void dirichlet_char_mul(dirichlet_char_t c, const dirichlet_group_t G, const dirichlet_char_t a, const dirichlet_char_t b); +void dirichlet_char_mul(dirichlet_char_t chi12, const dirichlet_group_t G, const dirichlet_char_t chi1, const dirichlet_char_t chi2); void dirichlet_char_pow(dirichlet_char_t c, const dirichlet_group_t G, const dirichlet_char_t a, ulong n); -void dirichlet_char_lower(dirichlet_char_t y, const dirichlet_group_t H, const dirichlet_char_t x, const dirichlet_group_t G); -void dirichlet_char_lift(dirichlet_char_t y, const dirichlet_group_t G, const dirichlet_char_t x, const dirichlet_group_t H); +void dirichlet_char_lower(dirichlet_char_t chi_H, const dirichlet_group_t H, const dirichlet_char_t chi_G, const dirichlet_group_t G); +void dirichlet_char_lift(dirichlet_char_t chi_G, const dirichlet_group_t G, const dirichlet_char_t chi_H, const dirichlet_group_t H); #define DIRICHLET_CHI_NULL UWORD_MAX ulong dirichlet_pairing(const dirichlet_group_t G, ulong m, ulong n); -ulong dirichlet_pairing_char(const dirichlet_group_t G, const dirichlet_char_t a, const dirichlet_char_t b); +ulong dirichlet_pairing_char(const dirichlet_group_t G, const dirichlet_char_t chi, const dirichlet_char_t psi); DIRICHLET_INLINE int dirichlet_char_is_principal(const dirichlet_group_t G, const dirichlet_char_t chi) diff --git a/src/fexpr.h b/src/fexpr.h index 16c070d279..51fefe780f 100644 --- a/src/fexpr.h +++ b/src/fexpr.h @@ -263,7 +263,7 @@ fexpr_is_zero(const fexpr_t expr) void fexpr_set_si(fexpr_t res, slong c); void fexpr_set_ui(fexpr_t res, ulong c); void fexpr_set_fmpz(fexpr_t res, const fmpz_t c); -int fexpr_get_fmpz(fmpz_t c, const fexpr_t x); +int fexpr_get_fmpz(fmpz_t res, const fexpr_t expr); void fexpr_set_fmpq(fexpr_t res, const fmpq_t x); FEXPR_INLINE void @@ -312,7 +312,7 @@ fexpr_is_builtin_symbol(const fexpr_t expr, slong i) } /* todo: document, test */ -int fexpr_is_builtin_call(const fexpr_t expr, slong i); +int fexpr_is_builtin_call(const fexpr_t expr, slong id); int fexpr_is_any_builtin_call(const fexpr_t expr); FEXPR_INLINE slong @@ -335,10 +335,10 @@ fexpr_nargs(const fexpr_t expr) } void fexpr_func(fexpr_t res, const fexpr_t expr); -void fexpr_view_func(fexpr_t res, const fexpr_t expr); +void fexpr_view_func(fexpr_t view, const fexpr_t expr); void fexpr_arg(fexpr_t res, const fexpr_t expr, slong i); -void fexpr_view_arg(fexpr_t res, const fexpr_t expr, slong i); +void fexpr_view_arg(fexpr_t view, const fexpr_t expr, slong i); FEXPR_INLINE void fexpr_view_next(fexpr_t view) @@ -355,8 +355,8 @@ void fexpr_call4(fexpr_t res, const fexpr_t f, const fexpr_t x1, const fexpr_t x void fexpr_call_vec(fexpr_t res, const fexpr_t f, fexpr_srcptr args, slong len); -void fexpr_call_builtin1(fexpr_t res, slong f, const fexpr_t x); -void fexpr_call_builtin2(fexpr_t res, slong f, const fexpr_t x, const fexpr_t y); +void fexpr_call_builtin1(fexpr_t res, slong f, const fexpr_t x1); +void fexpr_call_builtin2(fexpr_t res, slong f, const fexpr_t x1, const fexpr_t x2); /* Subexpressions and replacement */ @@ -377,7 +377,7 @@ char * fexpr_get_str(const fexpr_t expr); #define FEXPR_LATEX_SMALL 1 #define FEXPR_LATEX_LOGIC 2 -void fexpr_write_latex(calcium_stream_t out, const fexpr_t expr, ulong flags); +void fexpr_write_latex(calcium_stream_t stream, const fexpr_t expr, ulong flags); void fexpr_print_latex(const fexpr_t expr, ulong flags); char * fexpr_get_str_latex(const fexpr_t expr, ulong flags); diff --git a/src/fmpq.h b/src/fmpq.h index 065241b4e7..c67f24d277 100644 --- a/src/fmpq.h +++ b/src/fmpq.h @@ -107,10 +107,10 @@ int _fmpq_cmp_fmpz(const fmpz_t p, const fmpz_t q, const fmpz_t r); int fmpq_cmp_fmpz(const fmpq_t x, const fmpz_t y); int _fmpq_cmp_ui(const fmpz_t p, const fmpz_t q, ulong c); -int fmpq_cmp_ui(const fmpq_t x, ulong c); +int fmpq_cmp_ui(const fmpq_t x, ulong y); int _fmpq_cmp_si(const fmpz_t p, const fmpz_t q, slong c); -int fmpq_cmp_si(const fmpq_t x, slong c); +int fmpq_cmp_si(const fmpq_t x, slong y); void _fmpq_canonicalise(fmpz_t num, fmpz_t den); void fmpq_canonicalise(fmpq_t res); @@ -156,7 +156,7 @@ FMPQ_INLINE void fmpq_get_mpq(mpq_t dest, const fmpq_t src) fmpz_get_mpz(mpq_denref(dest), fmpq_denref(src)); } -double fmpq_get_d(const fmpq_t a); +double fmpq_get_d(const fmpq_t f); #ifdef __MPFR_H int fmpq_get_mpfr(mpfr_t r, const fmpq_t x, mpfr_rnd_t rnd); @@ -231,7 +231,7 @@ void fmpq_mul(fmpq_t res, const fmpq_t op1, const fmpq_t op2); void fmpq_mul_fmpz(fmpq_t res, const fmpq_t op, const fmpz_t x); void _fmpq_pow_si(fmpz_t rnum, fmpz_t rden, const fmpz_t opnum, const fmpz_t opden, slong e); -void fmpq_pow_si(fmpq_t rop, const fmpq_t op, slong e); +void fmpq_pow_si(fmpq_t res, const fmpq_t op, slong e); int fmpq_pow_fmpz(fmpq_t a, const fmpq_t b, const fmpz_t e); @@ -258,10 +258,10 @@ int fmpq_mod_fmpz(fmpz_t res, const fmpq_t x, const fmpz_t mod); void _fmpq_gcd(fmpz_t rnum, fmpz_t rden, const fmpz_t p, const fmpz_t q, const fmpz_t r, const fmpz_t s); void fmpq_gcd(fmpq_t res, const fmpq_t op1, const fmpq_t op2); -void _fmpq_gcd_cofactors(fmpz_t ng, fmpz_t dg, fmpz_t A, fmpz_t B, const fmpz_t na, const fmpz_t da, const fmpz_t nb, const fmpz_t db); -void fmpq_gcd_cofactors(fmpq_t g, fmpz_t A, fmpz_t B, const fmpq_t a, const fmpq_t b); +void _fmpq_gcd_cofactors(fmpz_t gnum, fmpz_t gden, fmpz_t abar, fmpz_t bbar, const fmpz_t anum, const fmpz_t aden, const fmpz_t bnum, const fmpz_t bden); +void fmpq_gcd_cofactors(fmpq_t g, fmpz_t abar, fmpz_t bbar, const fmpq_t a, const fmpq_t b); -int _fmpq_reconstruct_fmpz(fmpz_t num, fmpz_t den, const fmpz_t a, const fmpz_t m); +int _fmpq_reconstruct_fmpz(fmpz_t n, fmpz_t d, const fmpz_t a, const fmpz_t m); int fmpq_reconstruct_fmpz(fmpq_t res, const fmpz_t a, const fmpz_t m); int _fmpq_reconstruct_fmpz_2_naive(fmpz_t n, fmpz_t d, const fmpz_t a, const fmpz_t m, const fmpz_t N, const fmpz_t D); @@ -284,10 +284,10 @@ void fmpq_next_minimal(fmpq_t res, const fmpq_t x); void _fmpq_next_signed_minimal(fmpz_t rnum, fmpz_t rden, const fmpz_t num, const fmpz_t den); void fmpq_next_signed_minimal(fmpq_t res, const fmpq_t x); -void fmpq_farey_neighbors(fmpq_t left, fmpq_t right, const fmpq_t mid, const fmpz_t Q); +void fmpq_farey_neighbors(fmpq_t l, fmpq_t r, const fmpq_t x, const fmpz_t Q); -void _fmpq_simplest_between(fmpz_t mid_num, fmpz_t mid_den, const fmpz_t l_num, const fmpz_t l_den, const fmpz_t r_num, const fmpz_t r_den); -void fmpq_simplest_between(fmpq_t mid, const fmpq_t l, const fmpq_t r); +void _fmpq_simplest_between(fmpz_t x_num, fmpz_t x_den, const fmpz_t l_num, const fmpz_t l_den, const fmpz_t r_num, const fmpz_t r_den); +void fmpq_simplest_between(fmpq_t x, const fmpq_t l, const fmpq_t r); slong fmpq_get_cfrac_naive(fmpz * c, fmpq_t rem, const fmpq_t x, slong n); slong fmpq_get_cfrac(fmpz * c, fmpq_t rem, const fmpq_t x, slong n); diff --git a/src/fmpq_poly.h b/src/fmpq_poly.h index 0db6b01f40..9b7855fee1 100644 --- a/src/fmpq_poly.h +++ b/src/fmpq_poly.h @@ -351,7 +351,7 @@ void fmpq_poly_submul(fmpq_poly_t rop, const fmpq_poly_t op1, const fmpq_poly_t void _fmpq_poly_pow(fmpz * rpoly, fmpz_t rden, const fmpz * poly, const fmpz_t den, slong len, ulong e); -void fmpq_poly_pow(fmpq_poly_t rpoly, const fmpq_poly_t poly, ulong e); +void fmpq_poly_pow(fmpq_poly_t res, const fmpq_poly_t poly, ulong e); void _fmpq_poly_pow_trunc(fmpz * res, fmpz_t resden, const fmpz * f, const fmpz_t fden, slong flen, ulong exp, slong len); @@ -410,7 +410,7 @@ slong fmpq_poly_remove(fmpq_poly_t q, const fmpq_poly_t poly1, void _fmpq_poly_inv_series_newton(fmpz * Qinv, fmpz_t Qinvden, const fmpz * Q, const fmpz_t Qden, slong Qlen, slong n); -void fmpq_poly_inv_series_newton(fmpq_poly_t Qinv, const fmpq_poly_t Q, slong n); +void fmpq_poly_inv_series_newton(fmpq_poly_t res, const fmpq_poly_t poly, slong n); FMPQ_POLY_INLINE void _fmpq_poly_inv_series(fmpz * Qinv, fmpz_t Qinvden, @@ -464,7 +464,7 @@ void _fmpq_poly_resultant_div(fmpz_t rnum, fmpz_t rden, const fmpz *poly2, const fmpz_t den2, slong len2, const fmpz_t divisor, slong nbits); -void fmpq_poly_resultant_div(fmpq_t r, const fmpq_poly_t f, const fmpq_poly_t g, const fmpz_t divisor, slong nbits); +void fmpq_poly_resultant_div(fmpq_t r, const fmpq_poly_t f, const fmpq_poly_t g, const fmpz_t div, slong nbits); /* Derivative and integral *************************************************/ @@ -488,12 +488,12 @@ void fmpq_poly_integral(fmpq_poly_t res, const fmpq_poly_t poly); void _fmpq_poly_invsqrt_series(fmpz * rpoly, fmpz_t rden, const fmpz * poly, const fmpz_t den, slong len, slong n); -void fmpq_poly_invsqrt_series(fmpq_poly_t res, const fmpq_poly_t poly, slong n); +void fmpq_poly_invsqrt_series(fmpq_poly_t res, const fmpq_poly_t f, slong n); void _fmpq_poly_sqrt_series(fmpz * rpoly, fmpz_t rden, const fmpz * poly, const fmpz_t den, slong len, slong n); -void fmpq_poly_sqrt_series(fmpq_poly_t res, const fmpq_poly_t poly, slong n); +void fmpq_poly_sqrt_series(fmpq_poly_t res, const fmpq_poly_t f, slong n); /* Power sums ****************************************************************/ @@ -517,47 +517,47 @@ void fmpq_poly_log_series(fmpq_poly_t res, const fmpq_poly_t f, slong n); void _fmpq_poly_exp_series(fmpz * g, fmpz_t gden, const fmpz * h, const fmpz_t hden, slong hlen, slong n); -void fmpq_poly_exp_series(fmpq_poly_t res, const fmpq_poly_t poly, slong n); +void fmpq_poly_exp_series(fmpq_poly_t res, const fmpq_poly_t h, slong n); void _fmpq_poly_exp_expinv_series(fmpz * g, fmpz_t gden, fmpz * r, fmpz_t rden, const fmpz * h, const fmpz_t hden, slong hlen, slong n); -void fmpq_poly_exp_expinv_series(fmpq_poly_t res1, fmpq_poly_t res2, const fmpq_poly_t poly, slong n); +void fmpq_poly_exp_expinv_series(fmpq_poly_t res1, fmpq_poly_t res2, const fmpq_poly_t h, slong n); void _fmpq_poly_atan_series(fmpz * g, fmpz_t gden, const fmpz * h, const fmpz_t hden, slong hlen, slong n); -void fmpq_poly_atan_series(fmpq_poly_t res, const fmpq_poly_t poly, slong n); +void fmpq_poly_atan_series(fmpq_poly_t res, const fmpq_poly_t f, slong n); void _fmpq_poly_atanh_series(fmpz * g, fmpz_t gden, const fmpz * h, const fmpz_t hden, slong hlen, slong n); -void fmpq_poly_atanh_series(fmpq_poly_t res, const fmpq_poly_t poly, slong n); +void fmpq_poly_atanh_series(fmpq_poly_t res, const fmpq_poly_t f, slong n); void _fmpq_poly_asin_series(fmpz * g, fmpz_t gden, const fmpz * h, const fmpz_t hden, slong hlen, slong n); -void fmpq_poly_asin_series(fmpq_poly_t res, const fmpq_poly_t poly, slong n); +void fmpq_poly_asin_series(fmpq_poly_t res, const fmpq_poly_t f, slong n); void _fmpq_poly_asinh_series(fmpz * g, fmpz_t gden, const fmpz * h, const fmpz_t hden, slong hlen, slong n); -void fmpq_poly_asinh_series(fmpq_poly_t res, const fmpq_poly_t poly, slong n); +void fmpq_poly_asinh_series(fmpq_poly_t res, const fmpq_poly_t f, slong n); void _fmpq_poly_tan_series(fmpz * g, fmpz_t gden, const fmpz * h, const fmpz_t hden, slong hlen, slong n); -void fmpq_poly_tan_series(fmpq_poly_t res, const fmpq_poly_t poly, slong n); +void fmpq_poly_tan_series(fmpq_poly_t res, const fmpq_poly_t f, slong n); void _fmpq_poly_sin_series(fmpz * g, fmpz_t gden, const fmpz * h, const fmpz_t hden, slong hlen, slong n); -void fmpq_poly_sin_series(fmpq_poly_t res, const fmpq_poly_t poly, slong n); +void fmpq_poly_sin_series(fmpq_poly_t res, const fmpq_poly_t f, slong n); void _fmpq_poly_cos_series(fmpz * g, fmpz_t gden, const fmpz * h, const fmpz_t hden, slong hlen, slong n); -void fmpq_poly_cos_series(fmpq_poly_t res, const fmpq_poly_t poly, slong n); +void fmpq_poly_cos_series(fmpq_poly_t res, const fmpq_poly_t f, slong n); void _fmpq_poly_sin_cos_series(fmpz * s, fmpz_t sden, fmpz * c, fmpz_t cden, const fmpz * h, const fmpz_t hden, slong hlen, slong n); @@ -568,12 +568,12 @@ void fmpq_poly_sin_cos_series(fmpq_poly_t res1, fmpq_poly_t res2, void _fmpq_poly_sinh_series(fmpz * g, fmpz_t gden, const fmpz * h, const fmpz_t hden, slong hlen, slong n); -void fmpq_poly_sinh_series(fmpq_poly_t res, const fmpq_poly_t poly, slong n); +void fmpq_poly_sinh_series(fmpq_poly_t res, const fmpq_poly_t f, slong n); void _fmpq_poly_cosh_series(fmpz * g, fmpz_t gden, const fmpz * h, const fmpz_t hden, slong hlen, slong n); -void fmpq_poly_cosh_series(fmpq_poly_t res, const fmpq_poly_t poly, slong n); +void fmpq_poly_cosh_series(fmpq_poly_t res, const fmpq_poly_t f, slong n); void _fmpq_poly_sinh_cosh_series(fmpz * s, fmpz_t sden, fmpz * c, fmpz_t cden, const fmpz * h, const fmpz_t hden, slong hlen, slong n); @@ -584,7 +584,7 @@ void fmpq_poly_sinh_cosh_series(fmpq_poly_t res1, fmpq_poly_t res2, void _fmpq_poly_tanh_series(fmpz * g, fmpz_t gden, const fmpz * h, const fmpz_t hden, slong hlen, slong n); -void fmpq_poly_tanh_series(fmpq_poly_t res, const fmpq_poly_t poly, slong n); +void fmpq_poly_tanh_series(fmpq_poly_t res, const fmpq_poly_t f, slong n); /* Orthogonal polynomials ***************************************************/ diff --git a/src/fmpq_vec.h b/src/fmpq_vec.h index 8eb688d865..9442526726 100644 --- a/src/fmpq_vec.h +++ b/src/fmpq_vec.h @@ -26,7 +26,7 @@ extern "C" { /* Memory management *******************************************************/ -fmpq * _fmpq_vec_init(slong len); +fmpq * _fmpq_vec_init(slong n); void _fmpq_vec_clear(fmpq * vec, slong len); /* Randomisation ***********************************************************/ diff --git a/src/fmpz.h b/src/fmpz.h index a008d9ea93..f709a1e685 100644 --- a/src/fmpz.h +++ b/src/fmpz.h @@ -100,7 +100,7 @@ void flint_mpz_clear_readonly(mpz_t z); void _fmpz_clear_readonly_mpz(mpz_t); void fmpz_clear_readonly(fmpz_t f); -int _fmpz_is_canonical(const fmpz_t x); +int _fmpz_is_canonical(const fmpz_t f); /* Randomisation *************************************************************/ @@ -245,7 +245,7 @@ fmpz_set_signed_uiui(fmpz_t r, ulong hi, ulong lo) } } -void fmpz_set_signed_uiuiui(fmpz_t r, ulong hi, ulong mid, ulong lo); +void fmpz_set_signed_uiuiui(fmpz_t f, ulong hi, ulong mid, ulong lo); void fmpz_get_ui_array(ulong * out, slong n, const fmpz_t in); void fmpz_set_ui_array(fmpz_t out, const ulong * in, slong n); @@ -315,7 +315,7 @@ int fmpz_fits_si(const fmpz_t f); size_t fmpz_sizeinbase(const fmpz_t f, int b); mp_size_t fmpz_size(const fmpz_t f); flint_bitcnt_t fmpz_bits(const fmpz_t f); -flint_bitcnt_t fmpz_val2(const fmpz_t x); +flint_bitcnt_t fmpz_val2(const fmpz_t f); int fmpz_is_square(const fmpz_t f); int fmpz_is_perfect_power(fmpz_t root, const fmpz_t f); @@ -342,10 +342,10 @@ size_t fmpz_out_raw(FILE * fout, const fmpz_t x); /* Basic arithmetic **********************************************************/ void fmpz_add(fmpz_t f, const fmpz_t g, const fmpz_t h); -void fmpz_add_ui(fmpz_t f, const fmpz_t g, ulong x); +void fmpz_add_ui(fmpz_t f, const fmpz_t g, ulong h); void fmpz_sub(fmpz_t f, const fmpz_t g, const fmpz_t h); -void fmpz_sub_ui(fmpz_t f, const fmpz_t g, ulong x); +void fmpz_sub_ui(fmpz_t f, const fmpz_t g, ulong h); FMPZ_INLINE void fmpz_add_si(fmpz_t f, const fmpz_t g, slong x) { @@ -366,8 +366,8 @@ FMPZ_INLINE void fmpz_sub_si(fmpz_t f, const fmpz_t g, slong x) void fmpz_abs(fmpz_t f1, const fmpz_t f2); void fmpz_neg(fmpz_t f1, const fmpz_t f2); -void fmpz_mul_ui(fmpz_t f, const fmpz_t g, ulong x); -void fmpz_mul_si(fmpz_t f, const fmpz_t g, slong x); +void fmpz_mul_ui(fmpz_t f, const fmpz_t g, ulong h); +void fmpz_mul_si(fmpz_t f, const fmpz_t g, slong h); void fmpz_mul(fmpz_t f, const fmpz_t g, const fmpz_t h); FMPZ_INLINE void @@ -387,23 +387,23 @@ fmpz_mul2_uiui(fmpz_t f, const fmpz_t g, ulong h1, ulong h2) } } -void fmpz_mul_2exp(fmpz_t f, const fmpz_t g, ulong exp); -void fmpz_one_2exp(fmpz_t f, ulong exp); +void fmpz_mul_2exp(fmpz_t f, const fmpz_t g, ulong e); +void fmpz_one_2exp(fmpz_t f, ulong e); void fmpz_addmul(fmpz_t f, const fmpz_t g, const fmpz_t h); -void fmpz_addmul_si(fmpz_t f, const fmpz_t g, slong x); -void fmpz_addmul_ui(fmpz_t f, const fmpz_t g, ulong x); +void fmpz_addmul_si(fmpz_t f, const fmpz_t g, slong h); +void fmpz_addmul_ui(fmpz_t f, const fmpz_t g, ulong h); void fmpz_submul(fmpz_t f, const fmpz_t g, const fmpz_t h); -void fmpz_submul_si(fmpz_t f, const fmpz_t g, slong x); -void fmpz_submul_ui(fmpz_t f, const fmpz_t g, ulong x); +void fmpz_submul_si(fmpz_t f, const fmpz_t g, slong h); +void fmpz_submul_ui(fmpz_t f, const fmpz_t g, ulong h); void fmpz_fmma(fmpz_t f, const fmpz_t a, const fmpz_t b, const fmpz_t c, const fmpz_t d); void fmpz_fmms(fmpz_t f, const fmpz_t a, const fmpz_t b, const fmpz_t c, const fmpz_t d); -void fmpz_pow_ui(fmpz_t f, const fmpz_t g, ulong exp); -void fmpz_ui_pow_ui(fmpz_t x, ulong b, ulong e); -int fmpz_pow_fmpz(fmpz_t a, const fmpz_t b, const fmpz_t e); +void fmpz_pow_ui(fmpz_t f, const fmpz_t g, ulong x); +void fmpz_ui_pow_ui(fmpz_t f, ulong g, ulong x); +int fmpz_pow_fmpz(fmpz_t f, const fmpz_t g, const fmpz_t x); void fmpz_sqrt(fmpz_t f, const fmpz_t g); void fmpz_sqrtrem(fmpz_t f, fmpz_t r, const fmpz_t g); @@ -439,11 +439,11 @@ fmpz_divexact2_uiui(fmpz_t f, const fmpz_t g, ulong h1, ulong h2) void fmpz_cdiv_qr(fmpz_t f, fmpz_t s, const fmpz_t g, const fmpz_t h); void fmpz_fdiv_qr(fmpz_t f, fmpz_t s, const fmpz_t g, const fmpz_t h); void fmpz_tdiv_qr(fmpz_t f, fmpz_t s, const fmpz_t g, const fmpz_t h); -void fmpz_ndiv_qr(fmpz_t q, fmpz_t r, const fmpz_t a, const fmpz_t b); +void fmpz_ndiv_qr(fmpz_t f, fmpz_t s, const fmpz_t g, const fmpz_t h); -void fmpz_cdiv_r_2exp(fmpz_t f, const fmpz_t g, ulong exp); -void fmpz_fdiv_r_2exp(fmpz_t f, const fmpz_t g, ulong exp); -void fmpz_tdiv_r_2exp(fmpz_t f, const fmpz_t g, ulong exp); +void fmpz_cdiv_r_2exp(fmpz_t s, const fmpz_t g, ulong exp); +void fmpz_fdiv_r_2exp(fmpz_t s, const fmpz_t g, ulong exp); +void fmpz_tdiv_r_2exp(fmpz_t s, const fmpz_t g, ulong exp); void fmpz_cdiv_q_2exp(fmpz_t f, const fmpz_t g, ulong exp); void fmpz_fdiv_q_2exp(fmpz_t f, const fmpz_t g, ulong exp); @@ -457,7 +457,7 @@ void fmpz_cdiv_q(fmpz_t f, const fmpz_t g, const fmpz_t h); void fmpz_fdiv_q(fmpz_t f, const fmpz_t g, const fmpz_t h); void fmpz_tdiv_q(fmpz_t f, const fmpz_t g, const fmpz_t h); -void fmpz_fdiv_r(fmpz_t f, const fmpz_t g, const fmpz_t h); +void fmpz_fdiv_r(fmpz_t s, const fmpz_t g, const fmpz_t h); void fmpz_cdiv_q_ui(fmpz_t f, const fmpz_t g, ulong h); void fmpz_fdiv_q_ui(fmpz_t f, const fmpz_t g, ulong h); @@ -480,7 +480,7 @@ slong fmpz_clog_ui(const fmpz_t x, ulong b); slong fmpz_flog_ui(const fmpz_t x, ulong b); double fmpz_get_d_2exp(slong * exp, const fmpz_t f); -void fmpz_set_d_2exp(fmpz_t f, double m, slong exp); +void fmpz_set_d_2exp(fmpz_t f, double d, slong exp); #if FLINT_HAVE_FFT_SMALL #define MPZ_WANT_FLINT_DIVISION(a, b) (mpz_size(b) >= 1250 && mpz_size(a) - mpz_size(b) >= 1250) @@ -556,7 +556,7 @@ fmpz_negmod(fmpz_t r, const fmpz_t a, const fmpz_t mod) int fmpz_invmod(fmpz_t f, const fmpz_t g, const fmpz_t h); int fmpz_sqrtmod(fmpz_t b, const fmpz_t a, const fmpz_t p); -void fmpz_powm_ui(fmpz_t f, const fmpz_t g, ulong exp, const fmpz_t m); +void fmpz_powm_ui(fmpz_t f, const fmpz_t g, ulong e, const fmpz_t m); void fmpz_powm(fmpz_t f, const fmpz_t g, const fmpz_t e, const fmpz_t m); void fmpz_divides_mod_list(fmpz_t xstart, fmpz_t xstride, fmpz_t xlength, const fmpz_t a, const fmpz_t b, const fmpz_t n); @@ -567,7 +567,7 @@ slong fmpz_remove(fmpz_t rop, const fmpz_t op, const fmpz_t f); /* GCD and LCM ***************************************************************/ void fmpz_gcd(fmpz_t f, const fmpz_t g, const fmpz_t h); -void fmpz_gcd_ui(fmpz_t res, const fmpz_t a, ulong b); +void fmpz_gcd_ui(fmpz_t f, const fmpz_t g, ulong h); void fmpz_gcd3(fmpz_t f, const fmpz_t a, const fmpz_t b, const fmpz_t c); void fmpz_gcdinv(fmpz_t d, fmpz_t a, const fmpz_t f, const fmpz_t g); @@ -579,7 +579,7 @@ void fmpz_lcm(fmpz_t f, const fmpz_t g, const fmpz_t h); /* preinvn *******************************************************************/ -void fmpz_fdiv_qr_preinvn(fmpz_t f, fmpz_t s, const fmpz_t g, const fmpz_t h, const fmpz_preinvn_t inv); +void fmpz_fdiv_qr_preinvn(fmpz_t f, fmpz_t s, const fmpz_t g, const fmpz_t h, const fmpz_preinvn_t hinv); void fmpz_fdiv_r_preinvn(fmpz_t f, const fmpz_t g, const fmpz_t h, const fmpz_preinvn_t inv); void fmpz_preinvn_init(fmpz_preinvn_t inv, const fmpz_t f); @@ -588,15 +588,15 @@ void fmpz_preinvn_clear(fmpz_preinvn_t inv); /* Combinatorics functions ***************************************************/ void fmpz_fac_ui(fmpz_t f, ulong n); -void fmpz_bin_uiui(fmpz_t res, ulong n, ulong k); +void fmpz_bin_uiui(fmpz_t f, ulong n, ulong k); void _fmpz_rfac_ui(fmpz_t r, const fmpz_t x, ulong a, ulong b); -void fmpz_rfac_ui(fmpz_t r, const fmpz_t x, ulong n); -void fmpz_rfac_uiui(fmpz_t r, ulong x, ulong n); +void fmpz_rfac_ui(fmpz_t r, const fmpz_t x, ulong k); +void fmpz_rfac_uiui(fmpz_t r, ulong x, ulong k); /* Number theoretic functions ************************************************/ -int fmpz_jacobi(const fmpz_t a, const fmpz_t p); +int fmpz_jacobi(const fmpz_t a, const fmpz_t n); int fmpz_kronecker(const fmpz_t a, const fmpz_t n); void fmpz_fib_ui(fmpz_t f, ulong n); @@ -714,14 +714,14 @@ typedef struct { typedef fmpz_comb_temp_struct fmpz_comb_temp_t[1]; -void fmpz_comb_temp_init(fmpz_comb_temp_t CT, const fmpz_comb_t C); -void fmpz_comb_temp_clear(fmpz_comb_temp_t CT); +void fmpz_comb_temp_init(fmpz_comb_temp_t temp, const fmpz_comb_t comb); +void fmpz_comb_temp_clear(fmpz_comb_temp_t temp); -void fmpz_comb_init(fmpz_comb_t C, mp_srcptr primes, slong num_primes); +void fmpz_comb_init(fmpz_comb_t comb, mp_srcptr primes, slong num_primes); void fmpz_comb_clear(fmpz_comb_t C); void fmpz_multi_mod_ui(mp_limb_t * out, const fmpz_t in, const fmpz_comb_t C, fmpz_comb_temp_t CT); -void fmpz_multi_CRT_ui(fmpz_t output, mp_srcptr residues, const fmpz_comb_t comb, fmpz_comb_temp_t temp, int sign); +void fmpz_multi_CRT_ui(fmpz_t output, mp_srcptr residues, const fmpz_comb_t comb, fmpz_comb_temp_t ctemp, int sign); /*****************************************************************************/ @@ -740,8 +740,8 @@ int fmpz_is_strong_probabprime(const fmpz_t n, const fmpz_t a); int fmpz_is_prime_pseudosquare(const fmpz_t n); int fmpz_is_prime_pocklington(fmpz_t F, fmpz_t R, const fmpz_t n, mp_ptr pm1, slong num_pm1); -int fmpz_is_prime_morrison(fmpz_t F, fmpz_t R, const fmpz_t n, mp_ptr pm1, slong num_pm1); -int fmpz_is_prime(const fmpz_t p); +int fmpz_is_prime_morrison(fmpz_t F, fmpz_t R, const fmpz_t n, mp_ptr pp1, slong num_pp1); +int fmpz_is_prime(const fmpz_t n); void fmpz_nextprime(fmpz_t res, const fmpz_t n, int proved); diff --git a/src/fmpz_extras.h b/src/fmpz_extras.h index b3f6e4cb98..4345f243a1 100644 --- a/src/fmpz_extras.h +++ b/src/fmpz_extras.h @@ -200,7 +200,7 @@ fmpz_min(fmpz_t z, const fmpz_t x, const fmpz_t y) (zn) = FLINT_ABS(zn); \ } -void fmpz_lshift_mpn(fmpz_t z, mp_srcptr d, mp_size_t dn, int sgnbit, flint_bitcnt_t shift); +void fmpz_lshift_mpn(fmpz_t z, mp_srcptr src, mp_size_t n, int negative, flint_bitcnt_t shift); static inline slong fmpz_allocated_bytes(const fmpz_t x) diff --git a/src/fmpz_factor.h b/src/fmpz_factor.h index 1030280328..af83395915 100644 --- a/src/fmpz_factor.h +++ b/src/fmpz_factor.h @@ -117,7 +117,7 @@ void fmpz_factor_ecm_add(mp_ptr x, mp_ptr z, mp_ptr x1, mp_ptr z1, mp_ptr x2, mp void fmpz_factor_ecm_mul_montgomery_ladder(mp_ptr x, mp_ptr z, mp_ptr x0, mp_ptr z0, mp_limb_t k, mp_ptr n, ecm_t ecm_inf); -int fmpz_factor_ecm_select_curve(mp_ptr f, mp_ptr sig, mp_ptr n, ecm_t ecm_inf); +int fmpz_factor_ecm_select_curve(mp_ptr f, mp_ptr sigma, mp_ptr n, ecm_t ecm_inf); int fmpz_factor_ecm_stage_I(mp_ptr f, const mp_limb_t *prime_array, mp_limb_t num, mp_limb_t B1, mp_ptr n, ecm_t ecm_inf); int fmpz_factor_ecm_stage_II(mp_ptr f, mp_limb_t B1, mp_limb_t B2, mp_limb_t P, mp_ptr n, ecm_t ecm_inf); diff --git a/src/fmpz_mat.h b/src/fmpz_mat.h index e5e5762308..2399e22e2e 100644 --- a/src/fmpz_mat.h +++ b/src/fmpz_mat.h @@ -219,7 +219,7 @@ void fmpz_mat_sqr_bodrato(fmpz_mat_t B, const fmpz_mat_t A); void fmpz_mat_sqr(fmpz_mat_t B, const fmpz_mat_t A); -void fmpz_mat_pow(fmpz_mat_t B, const fmpz_mat_t A, ulong exp); +void fmpz_mat_pow(fmpz_mat_t B, const fmpz_mat_t A, ulong e); void fmpz_mat_mul_fmpz_vec(fmpz * c, const fmpz_mat_t A, const fmpz * b, slong blen); @@ -239,7 +239,7 @@ void fmpz_mat_kronecker_product(fmpz_mat_t C, const fmpz_mat_t A, const fmpz_mat /* Content */ -void fmpz_mat_content(fmpz_t ret, const fmpz_mat_t A); +void fmpz_mat_content(fmpz_t mat_gcd, const fmpz_mat_t A); /* Permutations */ @@ -428,11 +428,11 @@ fmpz_mat_can_solve(fmpz_mat_t X, fmpz_t den, /* Nullspace *****************************************************************/ -slong fmpz_mat_nullspace(fmpz_mat_t res, const fmpz_mat_t mat); +slong fmpz_mat_nullspace(fmpz_mat_t B, const fmpz_mat_t A); /* Inverse *******************************************************************/ -int fmpz_mat_inv(fmpz_mat_t B, fmpz_t den, const fmpz_mat_t A); +int fmpz_mat_inv(fmpz_mat_t Ainv, fmpz_t den, const fmpz_mat_t A); /* Modular reduction and reconstruction **************************************/ @@ -472,9 +472,9 @@ int fmpz_mat_is_in_snf(const fmpz_mat_t A); /* Special matrices **********************************************************/ -int fmpz_mat_is_hadamard(const fmpz_mat_t A); +int fmpz_mat_is_hadamard(const fmpz_mat_t H); -int fmpz_mat_hadamard(fmpz_mat_t A); +int fmpz_mat_hadamard(fmpz_mat_t H); /* Gram matrix **************************************************************/ diff --git a/src/fmpz_mod.h b/src/fmpz_mod.h index 6037cf682d..d6d16c5274 100644 --- a/src/fmpz_mod.h +++ b/src/fmpz_mod.h @@ -123,8 +123,8 @@ void fmpz_mod_inv(fmpz_t a, const fmpz_t b, const fmpz_mod_ctx_t ctx); int fmpz_mod_divides(fmpz_t a, const fmpz_t b, const fmpz_t c, const fmpz_mod_ctx_t ctx); -void fmpz_mod_pow_ui(fmpz_t a, const fmpz_t b, ulong pow, const fmpz_mod_ctx_t ctx); -int fmpz_mod_pow_fmpz(fmpz_t a, const fmpz_t b, const fmpz_t pow, const fmpz_mod_ctx_t ctx); +void fmpz_mod_pow_ui(fmpz_t a, const fmpz_t b, ulong e, const fmpz_mod_ctx_t ctx); +int fmpz_mod_pow_fmpz(fmpz_t a, const fmpz_t b, const fmpz_t e, const fmpz_mod_ctx_t ctx); void fmpz_mod_rand(fmpz_t a, flint_rand_t state, const fmpz_mod_ctx_t ctx); void fmpz_mod_rand_not_zero(fmpz_t a, flint_rand_t state, const fmpz_mod_ctx_t ctx); diff --git a/src/fmpz_mod_mat.h b/src/fmpz_mod_mat.h index 9d108c5954..722dbd7c50 100644 --- a/src/fmpz_mod_mat.h +++ b/src/fmpz_mod_mat.h @@ -257,7 +257,7 @@ void fmpz_mod_mat_strong_echelon_form(fmpz_mod_mat_t mat, const fmpz_mod_ctx_t c /* Transforms ****************************************************************/ -void fmpz_mod_mat_similarity(fmpz_mod_mat_t A, slong r, fmpz_t d, const fmpz_mod_ctx_t ctx); +void fmpz_mod_mat_similarity(fmpz_mod_mat_t M, slong r, fmpz_t d, const fmpz_mod_ctx_t ctx); /* Permutations ************************************************************/ diff --git a/src/fmpz_mod_mpoly.h b/src/fmpz_mod_mpoly.h index fb4dc7e424..cc063c80be 100644 --- a/src/fmpz_mod_mpoly.h +++ b/src/fmpz_mod_mpoly.h @@ -275,7 +275,7 @@ slong fmpz_mod_mpoly_degree_si(const fmpz_mod_mpoly_t A, slong var, const fmpz_m int fmpz_mod_mpoly_total_degree_fits_si(const fmpz_mod_mpoly_t A, const fmpz_mod_mpoly_ctx_t ctx); -void fmpz_mod_mpoly_total_degree_fmpz(fmpz_t td, const fmpz_mod_mpoly_t A, const fmpz_mod_mpoly_ctx_t ctx); +void fmpz_mod_mpoly_total_degree_fmpz(fmpz_t tdeg, const fmpz_mod_mpoly_t A, const fmpz_mod_mpoly_ctx_t ctx); slong fmpz_mod_mpoly_total_degree_si(const fmpz_mod_mpoly_t A, const fmpz_mod_mpoly_ctx_t ctx); void fmpz_mod_mpoly_used_vars(int * used, const fmpz_mod_mpoly_t A, const fmpz_mod_mpoly_ctx_t ctx); @@ -377,8 +377,8 @@ void fmpz_mod_mpoly_set_term_coeff_ui(fmpz_mod_mpoly_t A, slong i, void fmpz_mod_mpoly_set_term_coeff_si(fmpz_mod_mpoly_t A, slong i, slong c, const fmpz_mod_mpoly_ctx_t ctx); -int fmpz_mod_mpoly_term_exp_fits_ui(const fmpz_mod_mpoly_t A, slong i, const fmpz_mod_mpoly_ctx_t ctx); -int fmpz_mod_mpoly_term_exp_fits_si(const fmpz_mod_mpoly_t A, slong i, const fmpz_mod_mpoly_ctx_t ctx); +int fmpz_mod_mpoly_term_exp_fits_ui(const fmpz_mod_mpoly_t poly, slong i, const fmpz_mod_mpoly_ctx_t ctx); +int fmpz_mod_mpoly_term_exp_fits_si(const fmpz_mod_mpoly_t poly, slong i, const fmpz_mod_mpoly_ctx_t ctx); void fmpz_mod_mpoly_get_term_exp_fmpz(fmpz ** exp, const fmpz_mod_mpoly_t A, slong i, const fmpz_mod_mpoly_ctx_t ctx); diff --git a/src/fmpz_mod_poly.h b/src/fmpz_mod_poly.h index e4b372fdb1..2a6235f9c2 100644 --- a/src/fmpz_mod_poly.h +++ b/src/fmpz_mod_poly.h @@ -153,13 +153,13 @@ void fmpz_mod_poly_randtest_monic_irreducible(fmpz_mod_poly_t f, void fmpz_mod_poly_randtest_monic_primitive(fmpz_mod_poly_t f, flint_rand_t state, slong len, const fmpz_mod_ctx_t ctx); -void fmpz_mod_poly_randtest_trinomial(fmpz_mod_poly_t f, flint_rand_t state, slong len, const fmpz_mod_ctx_t ctx); +void fmpz_mod_poly_randtest_trinomial(fmpz_mod_poly_t poly, flint_rand_t state, slong len, const fmpz_mod_ctx_t ctx); int fmpz_mod_poly_randtest_trinomial_irreducible(fmpz_mod_poly_t f, flint_rand_t state, slong len, slong max_attempts, const fmpz_mod_ctx_t ctx); -void fmpz_mod_poly_randtest_pentomial(fmpz_mod_poly_t f, flint_rand_t state, slong len, const fmpz_mod_ctx_t ctx); +void fmpz_mod_poly_randtest_pentomial(fmpz_mod_poly_t poly, flint_rand_t state, slong len, const fmpz_mod_ctx_t ctx); int fmpz_mod_poly_randtest_pentomial_irreducible(fmpz_mod_poly_t f, flint_rand_t state, slong len, slong max_attempts, @@ -245,9 +245,9 @@ void fmpz_mod_poly_inflate(fmpz_mod_poly_t result, const fmpz_mod_poly_t input, /* Conversion ***************************************************************/ -void fmpz_mod_poly_set_ui(fmpz_mod_poly_t f, ulong x, const fmpz_mod_ctx_t ctx); +void fmpz_mod_poly_set_ui(fmpz_mod_poly_t f, ulong c, const fmpz_mod_ctx_t ctx); void fmpz_mod_poly_set_nmod_poly(fmpz_mod_poly_t f, const nmod_poly_t g); -void fmpz_mod_poly_set_fmpz(fmpz_mod_poly_t poly, const fmpz_t c, const fmpz_mod_ctx_t ctx); +void fmpz_mod_poly_set_fmpz(fmpz_mod_poly_t f, const fmpz_t c, const fmpz_mod_ctx_t ctx); void fmpz_mod_poly_set_fmpz_poly(fmpz_mod_poly_t f, const fmpz_poly_t g, const fmpz_mod_ctx_t ctx); void fmpz_mod_poly_get_nmod_poly(nmod_poly_t f, const fmpz_mod_poly_t g); @@ -297,7 +297,7 @@ void _fmpz_mod_poly_scalar_mul_fmpz(fmpz *res, const fmpz *poly, slong len, cons void fmpz_mod_poly_scalar_mul_fmpz(fmpz_mod_poly_t res, const fmpz_mod_poly_t poly, const fmpz_t x, const fmpz_mod_ctx_t ctx); void _fmpz_mod_poly_scalar_mul_ui(fmpz *res, const fmpz *poly, slong len, ulong x, const fmpz_mod_ctx_t ctx); void fmpz_mod_poly_scalar_mul_ui(fmpz_mod_poly_t res, const fmpz_mod_poly_t poly, ulong x, const fmpz_mod_ctx_t ctx); -void fmpz_mod_poly_scalar_addmul_fmpz(fmpz_mod_poly_t A, const fmpz_mod_poly_t B, const fmpz_t x, const fmpz_mod_ctx_t ctx); +void fmpz_mod_poly_scalar_addmul_fmpz(fmpz_mod_poly_t rop, const fmpz_mod_poly_t op, const fmpz_t x, const fmpz_mod_ctx_t ctx); /* Scalar division ****************************************************/ @@ -666,7 +666,7 @@ void fmpz_mod_poly_minpoly(fmpz_mod_poly_t poly, const fmpz* seq, slong len, con /* Resultant ***************************************************************/ void _fmpz_mod_poly_resultant(fmpz_t res, const fmpz *A, slong lenA, const fmpz *B, slong lenB, const fmpz_mod_ctx_t ctx); -void fmpz_mod_poly_resultant(fmpz_t res, const fmpz_mod_poly_t A, const fmpz_mod_poly_t B, const fmpz_mod_ctx_t ctx); +void fmpz_mod_poly_resultant(fmpz_t res, const fmpz_mod_poly_t f, const fmpz_mod_poly_t g, const fmpz_mod_ctx_t ctx); /* Discriminant ************************************************************/ diff --git a/src/fmpz_mpoly.h b/src/fmpz_mpoly.h index 5eb612a160..fd0a1697f9 100644 --- a/src/fmpz_mpoly.h +++ b/src/fmpz_mpoly.h @@ -255,7 +255,7 @@ slong fmpz_mpoly_degree_si(const fmpz_mpoly_t A, slong var, const fmpz_mpoly_ctx int fmpz_mpoly_total_degree_fits_si(const fmpz_mpoly_t A, const fmpz_mpoly_ctx_t ctx); -void fmpz_mpoly_total_degree_fmpz(fmpz_t td, const fmpz_mpoly_t A, const fmpz_mpoly_ctx_t ctx); +void fmpz_mpoly_total_degree_fmpz(fmpz_t tdeg, const fmpz_mpoly_t A, const fmpz_mpoly_ctx_t ctx); slong fmpz_mpoly_total_degree_si(const fmpz_mpoly_t A, const fmpz_mpoly_ctx_t ctx); void fmpz_mpoly_used_vars(int * used, const fmpz_mpoly_t A, const fmpz_mpoly_ctx_t ctx); @@ -331,7 +331,7 @@ void _fmpz_mpoly_set_fmpz_poly_one_var(fmpz_mpoly_t A, flint_bitcnt_t Aminbits, fmpz * Acoeffs, slong Adeg, const fmpz_mpoly_ctx_t ctx); -void fmpz_mpoly_set_gen_fmpz_poly(fmpz_mpoly_t res, slong var, const fmpz_poly_t pol, const fmpz_mpoly_ctx_t ctx); +void fmpz_mpoly_set_gen_fmpz_poly(fmpz_mpoly_t A, slong var, const fmpz_poly_t B, const fmpz_mpoly_ctx_t ctx); /* comparison ****************************************************************/ @@ -353,14 +353,14 @@ void fmpz_mpoly_resize(fmpz_mpoly_t A, slong new_length, const fmpz_mpoly_ctx_t void fmpz_mpoly_get_term_coeff_fmpz(fmpz_t c, const fmpz_mpoly_t A, slong i, const fmpz_mpoly_ctx_t ctx); ulong fmpz_mpoly_get_term_coeff_ui(const fmpz_mpoly_t A, slong i, const fmpz_mpoly_ctx_t ctx); -slong fmpz_mpoly_get_term_coeff_si(const fmpz_mpoly_t A, slong i, const fmpz_mpoly_ctx_t ctx); +slong fmpz_mpoly_get_term_coeff_si(const fmpz_mpoly_t poly, slong i, const fmpz_mpoly_ctx_t ctx); void fmpz_mpoly_set_term_coeff_fmpz(fmpz_mpoly_t A, slong i, const fmpz_t c, const fmpz_mpoly_ctx_t ctx); void fmpz_mpoly_set_term_coeff_ui(fmpz_mpoly_t A, slong i, ulong c, const fmpz_mpoly_ctx_t ctx); void fmpz_mpoly_set_term_coeff_si(fmpz_mpoly_t A, slong i, slong c, const fmpz_mpoly_ctx_t ctx); -int fmpz_mpoly_term_exp_fits_ui(const fmpz_mpoly_t A, slong i, const fmpz_mpoly_ctx_t ctx); -int fmpz_mpoly_term_exp_fits_si(const fmpz_mpoly_t A, slong i, const fmpz_mpoly_ctx_t ctx); +int fmpz_mpoly_term_exp_fits_ui(const fmpz_mpoly_t poly, slong i, const fmpz_mpoly_ctx_t ctx); +int fmpz_mpoly_term_exp_fits_si(const fmpz_mpoly_t poly, slong i, const fmpz_mpoly_ctx_t ctx); void fmpz_mpoly_get_term_exp_fmpz(fmpz ** exp, const fmpz_mpoly_t A, slong i, const fmpz_mpoly_ctx_t ctx); @@ -958,7 +958,7 @@ typedef fmpz_mpoly_vec_struct fmpz_mpoly_vec_t[1]; #define fmpz_mpoly_vec_entry(vec, i) ((vec)->p + (i)) void fmpz_mpoly_vec_init(fmpz_mpoly_vec_t vec, slong len, const fmpz_mpoly_ctx_t ctx); -void fmpz_mpoly_vec_print(const fmpz_mpoly_vec_t F, const fmpz_mpoly_ctx_t ctx); +void fmpz_mpoly_vec_print(const fmpz_mpoly_vec_t vec, const fmpz_mpoly_ctx_t ctx); void fmpz_mpoly_vec_swap(fmpz_mpoly_vec_t x, fmpz_mpoly_vec_t y, const fmpz_mpoly_ctx_t ctx); void fmpz_mpoly_vec_fit_length(fmpz_mpoly_vec_t vec, slong len, const fmpz_mpoly_ctx_t ctx); void fmpz_mpoly_vec_clear(fmpz_mpoly_vec_t vec, const fmpz_mpoly_ctx_t ctx); @@ -971,15 +971,15 @@ void fmpz_mpoly_vec_randtest_not_zero(fmpz_mpoly_vec_t vec, flint_rand_t state, /* Ideals and Groenber bases */ void fmpz_mpoly_spoly(fmpz_mpoly_t res, const fmpz_mpoly_t f, const fmpz_mpoly_t g, const fmpz_mpoly_ctx_t ctx); -void fmpz_mpoly_vec_set_primitive_unique(fmpz_mpoly_vec_t G, const fmpz_mpoly_vec_t F, const fmpz_mpoly_ctx_t ctx); -void fmpz_mpoly_reduction_primitive_part(fmpz_mpoly_t res, const fmpz_mpoly_t f, const fmpz_mpoly_vec_t I, const fmpz_mpoly_ctx_t ctx); +void fmpz_mpoly_vec_set_primitive_unique(fmpz_mpoly_vec_t res, const fmpz_mpoly_vec_t src, const fmpz_mpoly_ctx_t ctx); +void fmpz_mpoly_reduction_primitive_part(fmpz_mpoly_t res, const fmpz_mpoly_t f, const fmpz_mpoly_vec_t vec, const fmpz_mpoly_ctx_t ctx); int fmpz_mpoly_vec_is_groebner(const fmpz_mpoly_vec_t G, const fmpz_mpoly_vec_t F, const fmpz_mpoly_ctx_t ctx); void fmpz_mpoly_buchberger_naive(fmpz_mpoly_vec_t G, const fmpz_mpoly_vec_t F, const fmpz_mpoly_ctx_t ctx); int fmpz_mpoly_buchberger_naive_with_limits(fmpz_mpoly_vec_t G, const fmpz_mpoly_vec_t F, slong ideal_len_limit, slong poly_len_limit, slong poly_bits_limit, const fmpz_mpoly_ctx_t ctx); void fmpz_mpoly_vec_autoreduction(fmpz_mpoly_vec_t H, const fmpz_mpoly_vec_t F, const fmpz_mpoly_ctx_t ctx); void fmpz_mpoly_vec_autoreduction_groebner(fmpz_mpoly_vec_t H, const fmpz_mpoly_vec_t G, const fmpz_mpoly_ctx_t ctx); -int fmpz_mpoly_vec_is_autoreduced(const fmpz_mpoly_vec_t G, const fmpz_mpoly_ctx_t ctx); +int fmpz_mpoly_vec_is_autoreduced(const fmpz_mpoly_vec_t F, const fmpz_mpoly_ctx_t ctx); /****************************************************************************** diff --git a/src/fmpz_mpoly_q.h b/src/fmpz_mpoly_q.h index 77ce05e26a..ef79161033 100644 --- a/src/fmpz_mpoly_q.h +++ b/src/fmpz_mpoly_q.h @@ -52,7 +52,7 @@ void fmpz_mpoly_q_set_si(fmpz_mpoly_q_t res, slong x, const fmpz_mpoly_ctx_t ctx void fmpz_mpoly_q_canonicalise(fmpz_mpoly_q_t x, const fmpz_mpoly_ctx_t ctx); -int fmpz_mpoly_q_is_canonical(const fmpz_mpoly_q_t res, const fmpz_mpoly_ctx_t ctx); +int fmpz_mpoly_q_is_canonical(const fmpz_mpoly_q_t x, const fmpz_mpoly_ctx_t ctx); /* Properties */ diff --git a/src/fmpz_poly.h b/src/fmpz_poly.h index 1ebd62ba7f..8b70e9bb69 100644 --- a/src/fmpz_poly.h +++ b/src/fmpz_poly.h @@ -322,8 +322,8 @@ void fmpz_poly_scalar_tdiv_2exp(fmpz_poly_t poly1, const fmpz_poly_t poly2, void fmpz_poly_scalar_mul_2exp(fmpz_poly_t poly1, const fmpz_poly_t poly2, ulong exp); -void fmpz_poly_scalar_mod_fmpz(fmpz_poly_t poly1, const fmpz_poly_t poly2, const fmpz_t x); -void fmpz_poly_scalar_smod_fmpz(fmpz_poly_t poly1, const fmpz_poly_t poly2, const fmpz_t x); +void fmpz_poly_scalar_mod_fmpz(fmpz_poly_t poly1, const fmpz_poly_t poly2, const fmpz_t p); +void fmpz_poly_scalar_smod_fmpz(fmpz_poly_t poly1, const fmpz_poly_t poly2, const fmpz_t p); slong _fmpz_poly_remove_content_2exp(fmpz * pol, slong len); @@ -545,7 +545,7 @@ flint_bitcnt_t _fmpz_poly_2norm_normalised_bits(const fmpz * poly, slong len); ulong fmpz_poly_max_limbs(const fmpz_poly_t poly); slong fmpz_poly_max_bits(const fmpz_poly_t poly); -void fmpz_poly_height(fmpz_t res, const fmpz_poly_t poly); +void fmpz_poly_height(fmpz_t height, const fmpz_poly_t poly); slong _fmpz_poly_hamming_weight(const fmpz * a, slong len); /* Greatest common divisor *************************************************/ @@ -1075,11 +1075,11 @@ void fmpz_poly_debug(const fmpz_poly_t poly); /* CRT ********************************************************************/ -void fmpz_poly_get_nmod_poly(nmod_poly_t res, const fmpz_poly_t poly); +void fmpz_poly_get_nmod_poly(nmod_poly_t Amod, const fmpz_poly_t A); -void fmpz_poly_set_nmod_poly(fmpz_poly_t res, const nmod_poly_t poly); +void fmpz_poly_set_nmod_poly(fmpz_poly_t A, const nmod_poly_t Amod); -void fmpz_poly_set_nmod_poly_unsigned(fmpz_poly_t res, const nmod_poly_t poly); +void fmpz_poly_set_nmod_poly_unsigned(fmpz_poly_t A, const nmod_poly_t Amod); void _fmpz_poly_CRT_ui_precomp(fmpz * res, const fmpz * poly1, slong len1, @@ -1185,11 +1185,11 @@ void fmpz_poly_bound_roots(fmpz_t bound, const fmpz_poly_t poly); void _fmpz_poly_num_real_roots_sturm(slong * n_neg, slong * n_pos, const fmpz * pol, slong len); -slong fmpz_poly_num_real_roots_sturm(const fmpz_poly_t poly); +slong fmpz_poly_num_real_roots_sturm(const fmpz_poly_t pol); slong _fmpz_poly_num_real_roots(const fmpz * pol, slong len); -slong fmpz_poly_num_real_roots(const fmpz_poly_t poly); +slong fmpz_poly_num_real_roots(const fmpz_poly_t pol); /* CLD bounds */ @@ -1207,7 +1207,7 @@ ulong fmpz_poly_is_cyclotomic(const fmpz_poly_t poly); void _fmpz_poly_cos_minpoly(fmpz * f, ulong n); -void fmpz_poly_cos_minpoly(fmpz_poly_t f, ulong n); +void fmpz_poly_cos_minpoly(fmpz_poly_t poly, ulong n); void _fmpz_poly_swinnerton_dyer(fmpz * T, ulong n); @@ -1239,11 +1239,11 @@ void fmpz_poly_fibonacci(fmpz_poly_t poly, ulong n); void _fmpz_poly_eta_qexp(fmpz * f, slong e, slong n); -void fmpz_poly_eta_qexp(fmpz_poly_t f, slong e, slong n); +void fmpz_poly_eta_qexp(fmpz_poly_t f, slong r, slong n); void _fmpz_poly_theta_qexp(fmpz * f, slong e, slong n); -void fmpz_poly_theta_qexp(fmpz_poly_t f, slong e, slong n); +void fmpz_poly_theta_qexp(fmpz_poly_t f, slong r, slong n); void fmpz_poly_eulerian_polynomial(fmpz_poly_t poly, ulong n); diff --git a/src/fmpz_poly_factor.h b/src/fmpz_poly_factor.h index 7ecf11c0db..efabc4b0e5 100644 --- a/src/fmpz_poly_factor.h +++ b/src/fmpz_poly_factor.h @@ -79,7 +79,7 @@ int fmpz_poly_factor_van_hoeij_check_if_solved(fmpz_mat_t M, void fmpz_poly_factor_van_hoeij(fmpz_poly_factor_t final_fac, const nmod_poly_factor_t fac, const fmpz_poly_t f, slong exp, ulong p); -void fmpz_poly_factor(fmpz_poly_factor_t fac, const fmpz_poly_t G); +void fmpz_poly_factor(fmpz_poly_factor_t final_fac, const fmpz_poly_t F); /* Inlines *******************************************************************/ diff --git a/src/fmpzi.h b/src/fmpzi.h index ca066bf55d..3b04130fa2 100644 --- a/src/fmpzi.h +++ b/src/fmpzi.h @@ -181,8 +181,8 @@ slong fmpzi_remove_one_plus_i(fmpzi_t res, const fmpzi_t x); void fmpzi_gcd_euclidean(fmpzi_t res, const fmpzi_t x, const fmpzi_t y); void fmpzi_gcd_euclidean_improved(fmpzi_t res, const fmpzi_t x, const fmpzi_t y); void fmpzi_gcd_binary(fmpzi_t res, const fmpzi_t x, const fmpzi_t y); -void fmpzi_gcd_shortest(fmpzi_t g, const fmpzi_t x, const fmpzi_t y); -void fmpzi_gcd(fmpzi_t g, const fmpzi_t x, const fmpzi_t y); +void fmpzi_gcd_shortest(fmpzi_t res, const fmpzi_t x, const fmpzi_t y); +void fmpzi_gcd(fmpzi_t res, const fmpzi_t x, const fmpzi_t y); /* Primality check */ int fmpzi_is_prime(const fmpzi_t n); diff --git a/src/fq.h b/src/fq.h index ec5113436b..f272e8463d 100644 --- a/src/fq.h +++ b/src/fq.h @@ -84,7 +84,7 @@ void fq_sub(fq_t rop, const fq_t op1, const fq_t op2, const fq_ctx_t ctx); void fq_sub_one(fq_t rop, const fq_t op1, const fq_ctx_t ctx); -void fq_neg(fq_t rop, const fq_t op1, const fq_ctx_t ctx); +void fq_neg(fq_t rop, const fq_t op, const fq_ctx_t ctx); void fq_mul(fq_t rop, const fq_t op1, const fq_t op2, const fq_ctx_t ctx); void fq_mul_fmpz(fq_t rop, const fq_t op, const fmpz_t x, const fq_ctx_t ctx); @@ -93,15 +93,15 @@ void fq_mul_ui(fq_t rop, const fq_t op, ulong x, const fq_ctx_t ctx); void fq_sqr(fq_t rop, const fq_t op, const fq_ctx_t ctx); -void fq_inv(fq_t rop, const fq_t op1, const fq_ctx_t ctx); +void fq_inv(fq_t rop, const fq_t op, const fq_ctx_t ctx); void _fq_pow(fmpz *rop, const fmpz *op, slong len, const fmpz_t e, const fq_ctx_t ctx); -void fq_pow(fq_t rop, const fq_t op1, const fmpz_t e, const fq_ctx_t ctx); +void fq_pow(fq_t rop, const fq_t op, const fmpz_t e, const fq_ctx_t ctx); void fq_pow_ui(fq_t rop, const fq_t op, const ulong e, const fq_ctx_t ctx); /* Roots *********************************************************************/ -int fq_sqrt(fq_t rop, const fq_t op, const fq_ctx_t ctx); +int fq_sqrt(fq_t rop, const fq_t op1, const fq_ctx_t ctx); void fq_pth_root(fq_t rop, const fq_t op1, const fq_ctx_t ctx); diff --git a/src/fq_nmod.h b/src/fq_nmod.h index 14ea7e2f7f..eefc57ad83 100644 --- a/src/fq_nmod.h +++ b/src/fq_nmod.h @@ -105,7 +105,7 @@ void fq_nmod_mul_ui(fq_nmod_t rop, void fq_nmod_sqr(fq_nmod_t rop, const fq_nmod_t op, const fq_nmod_ctx_t ctx); -void fq_nmod_inv(fq_nmod_t rop, const fq_nmod_t op1, const fq_nmod_ctx_t ctx); +void fq_nmod_inv(fq_nmod_t rop, const fq_nmod_t op, const fq_nmod_ctx_t ctx); void _fq_nmod_pow(mp_limb_t *rop, const mp_limb_t *op, slong len, const fmpz_t e, const fq_nmod_ctx_t ctx); @@ -118,7 +118,7 @@ void fq_nmod_pow_ui(fq_nmod_t rop, /* Roots ********************************************************************/ -int fq_nmod_sqrt(fq_nmod_t rop, const fq_nmod_t op, const fq_nmod_ctx_t ctx); +int fq_nmod_sqrt(fq_nmod_t rop, const fq_nmod_t op1, const fq_nmod_ctx_t ctx); void fq_nmod_pth_root(fq_nmod_t rop, const fq_nmod_t op1, const fq_nmod_ctx_t ctx); diff --git a/src/fq_nmod_mpoly.h b/src/fq_nmod_mpoly.h index 941f685e0a..d8aef5295a 100644 --- a/src/fq_nmod_mpoly.h +++ b/src/fq_nmod_mpoly.h @@ -386,7 +386,7 @@ slong fq_nmod_mpoly_degree_si(const fq_nmod_mpoly_t A, slong var, const fq_nmod_ int fq_nmod_mpoly_total_degree_fits_si(const fq_nmod_mpoly_t A, const fq_nmod_mpoly_ctx_t ctx); -void fq_nmod_mpoly_total_degree_fmpz(fmpz_t td, const fq_nmod_mpoly_t A, const fq_nmod_mpoly_ctx_t ctx); +void fq_nmod_mpoly_total_degree_fmpz(fmpz_t tdeg, const fq_nmod_mpoly_t A, const fq_nmod_mpoly_ctx_t ctx); slong fq_nmod_mpoly_total_degree_si(const fq_nmod_mpoly_t A, const fq_nmod_mpoly_ctx_t ctx); void fq_nmod_mpoly_used_vars(int * used, const fq_nmod_mpoly_t A, const fq_nmod_mpoly_ctx_t ctx); diff --git a/src/fq_zech.h b/src/fq_zech.h index 334da870d7..4076bb1b5f 100644 --- a/src/fq_zech.h +++ b/src/fq_zech.h @@ -117,7 +117,7 @@ void fq_zech_sub(fq_zech_t rop, const fq_zech_t op1, const fq_zech_t op2, void fq_zech_sub_one(fq_zech_t rop, const fq_zech_t op1, const fq_zech_ctx_t ctx); -void fq_zech_neg(fq_zech_t rop, const fq_zech_t op1, const fq_zech_ctx_t ctx); +void fq_zech_neg(fq_zech_t rop, const fq_zech_t op, const fq_zech_ctx_t ctx); void fq_zech_mul(fq_zech_t rop, const fq_zech_t op1, const fq_zech_t op2, const fq_zech_ctx_t ctx); @@ -133,7 +133,7 @@ void fq_zech_mul_ui(fq_zech_t rop, const fq_zech_t op, ulong x, void fq_zech_sqr(fq_zech_t rop, const fq_zech_t op, const fq_zech_ctx_t ctx); -void fq_zech_inv(fq_zech_t rop, const fq_zech_t op1, const fq_zech_ctx_t ctx); +void fq_zech_inv(fq_zech_t rop, const fq_zech_t op, const fq_zech_ctx_t ctx); void _fq_zech_pow(fmpz * rop, const fmpz * op, slong len, const fmpz_t e, const fmpz * a, const slong *j, slong lena, const fmpz_t p); @@ -152,7 +152,7 @@ int fq_zech_sqrt(fq_zech_t rop, const fq_zech_t op1, void fq_zech_pth_root(fq_zech_t rop, const fq_zech_t op1, const fq_zech_ctx_t ctx); -int fq_zech_is_square(const fq_zech_t op1, const fq_zech_ctx_t ctx); +int fq_zech_is_square(const fq_zech_t op, const fq_zech_ctx_t ctx); /* Randomisation *************************************************************/ @@ -283,7 +283,7 @@ int _fq_zech_ctx_init_conway(fq_zech_ctx_t, fmpz_t, slong, const char *); void fq_zech_ctx_init_conway(fq_zech_ctx_t, fmpz_t, slong, const char *); void fq_zech_ctx_init_random(fq_zech_ctx_t, fmpz_t, slong, const char *); -void fq_zech_ctx_order(fmpz_t, const fq_zech_ctx_t); +void fq_zech_ctx_order(fmpz_t f, const fq_zech_ctx_t ctx); #ifdef T #undef T diff --git a/src/gr.h b/src/gr.h index fd00261feb..025d466aa7 100644 --- a/src/gr.h +++ b/src/gr.h @@ -1486,8 +1486,8 @@ vector_ctx_t; #define VECTOR_CTX(ring_ctx) ((vector_ctx_t *)((ring_ctx))) -void gr_ctx_init_vector_gr_vec(gr_ctx_t ctx, gr_ctx_t base_ring); -void gr_ctx_init_vector_space_gr_vec(gr_ctx_t ctx, gr_ctx_t base_ring, slong n); +void gr_ctx_init_vector_gr_vec(gr_ctx_t ctx, gr_ctx_t base_type); +void gr_ctx_init_vector_space_gr_vec(gr_ctx_t ctx, gr_ctx_t base_type, slong n); /* Generic matrix ring */ @@ -1503,7 +1503,7 @@ matrix_ctx_t; #define MATRIX_CTX(ring_ctx) ((matrix_ctx_t *)((ring_ctx))) void gr_ctx_init_matrix_domain(gr_ctx_t ctx, gr_ctx_t base_ring); -void gr_ctx_init_matrix_space(gr_ctx_t ctx, gr_ctx_t base_ring, slong nrows, slong ncols); +void gr_ctx_init_matrix_space(gr_ctx_t ctx, gr_ctx_t base_ring, slong n, slong m); GR_INLINE void gr_ctx_init_matrix_ring(gr_ctx_t ctx, gr_ctx_t base_ring, slong n) { diff --git a/src/gr_mat.h b/src/gr_mat.h index 2c5a5b7da9..182b6b3ce6 100644 --- a/src/gr_mat.h +++ b/src/gr_mat.h @@ -94,7 +94,7 @@ WARN_UNUSED_RESULT int gr_mat_concat_vertical(gr_mat_t res, const gr_mat_t mat1, int gr_mat_write(gr_stream_t out, const gr_mat_t mat, gr_ctx_t ctx); int gr_mat_print(const gr_mat_t mat, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_randtest(gr_mat_t mat, flint_rand_t state, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_randtest(gr_mat_t res, flint_rand_t state, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_randops(gr_mat_t mat, flint_rand_t state, slong count, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_randpermdiag(int * parity, gr_mat_t mat, flint_rand_t state, gr_ptr diag, slong n, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_randrank(gr_mat_t mat, flint_rand_t state, slong rank, gr_ctx_t ctx); @@ -120,10 +120,10 @@ WARN_UNUSED_RESULT int gr_mat_zero(gr_mat_t res, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_one(gr_mat_t res, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_set(gr_mat_t res, const gr_mat_t mat, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_set_scalar(gr_mat_t res, gr_srcptr c, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_set_ui(gr_mat_t res, ulong v, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_set_si(gr_mat_t res, slong v, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_set_fmpz(gr_mat_t res, const fmpz_t v, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_set_fmpq(gr_mat_t res, const fmpq_t v, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_set_ui(gr_mat_t res, ulong c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_set_si(gr_mat_t res, slong c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_set_fmpz(gr_mat_t res, const fmpz_t c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_set_fmpq(gr_mat_t res, const fmpq_t c, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_set_fmpz_mat(gr_mat_t res, const fmpz_mat_t mat, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_set_fmpq_mat(gr_mat_t res, const fmpq_mat_t mat, gr_ctx_t ctx); @@ -134,17 +134,17 @@ WARN_UNUSED_RESULT int gr_mat_add(gr_mat_t res, const gr_mat_t mat1, const gr_ma WARN_UNUSED_RESULT int gr_mat_sub(gr_mat_t res, const gr_mat_t mat1, const gr_mat_t mat2, gr_ctx_t ctx); /* todo: test, wrap; div; more conversions */ -WARN_UNUSED_RESULT int gr_mat_add_scalar(gr_mat_t res, const gr_mat_t mat, gr_srcptr x, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_sub_scalar(gr_mat_t res, const gr_mat_t mat, gr_srcptr x, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_mul_scalar(gr_mat_t res, const gr_mat_t mat, gr_srcptr x, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_addmul_scalar(gr_mat_t res, const gr_mat_t mat, gr_srcptr x, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_submul_scalar(gr_mat_t res, const gr_mat_t mat, gr_srcptr x, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_div_scalar(gr_mat_t res, const gr_mat_t mat, gr_srcptr x, gr_ctx_t ctx); - -WARN_UNUSED_RESULT int gr_mat_mul_classical(gr_mat_t C, const gr_mat_t A, const gr_mat_t B, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_add_scalar(gr_mat_t res, const gr_mat_t mat, gr_srcptr c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_sub_scalar(gr_mat_t res, const gr_mat_t mat, gr_srcptr c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_mul_scalar(gr_mat_t res, const gr_mat_t mat, gr_srcptr c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_addmul_scalar(gr_mat_t res, const gr_mat_t mat, gr_srcptr c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_submul_scalar(gr_mat_t res, const gr_mat_t mat, gr_srcptr c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_div_scalar(gr_mat_t res, const gr_mat_t mat, gr_srcptr c, gr_ctx_t ctx); + +WARN_UNUSED_RESULT int gr_mat_mul_classical(gr_mat_t res, const gr_mat_t mat1, const gr_mat_t mat2, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_mul_strassen(gr_mat_t C, const gr_mat_t A, const gr_mat_t B, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_mul_generic(gr_mat_t C, const gr_mat_t A, const gr_mat_t B, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_mul(gr_mat_t C, const gr_mat_t A, const gr_mat_t B, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_mul(gr_mat_t res, const gr_mat_t mat1, const gr_mat_t mat2, gr_ctx_t ctx); /* todo */ GR_MAT_INLINE WARN_UNUSED_RESULT int @@ -153,8 +153,8 @@ gr_mat_sqr(gr_mat_t res, const gr_mat_t mat, gr_ctx_t ctx) return gr_mat_mul(res, mat, mat, ctx); } -WARN_UNUSED_RESULT int _gr_mat_gr_poly_evaluate(gr_mat_t y, gr_srcptr poly, slong len, const gr_mat_t x, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_gr_poly_evaluate(gr_mat_t res, const gr_poly_t f, const gr_mat_t a, gr_ctx_t ctx); +WARN_UNUSED_RESULT int _gr_mat_gr_poly_evaluate(gr_mat_t res, gr_srcptr poly, slong len, const gr_mat_t mat, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_gr_poly_evaluate(gr_mat_t res, const gr_poly_t poly, const gr_mat_t mat, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_find_nonzero_pivot_large_abs(slong * pivot_row, gr_mat_t mat, slong start_row, slong end_row, slong column, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_find_nonzero_pivot_generic(slong * pivot_row, gr_mat_t mat, slong start_row, slong end_row, slong column, gr_ctx_t ctx); @@ -179,20 +179,20 @@ WARN_UNUSED_RESULT int gr_mat_nonsingular_solve_den(gr_mat_t X, gr_ptr den, cons WARN_UNUSED_RESULT int gr_mat_solve_field(gr_mat_t X, const gr_mat_t A, const gr_mat_t B, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_det_berkowitz(gr_ptr res, const gr_mat_t A, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_det_fflu(gr_ptr res, const gr_mat_t A, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_det_lu(gr_ptr res, const gr_mat_t A, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_det_cofactor(gr_ptr res, const gr_mat_t A, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_det_berkowitz(gr_ptr res, const gr_mat_t mat, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_det_fflu(gr_ptr res, const gr_mat_t mat, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_det_lu(gr_ptr res, const gr_mat_t mat, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_det_cofactor(gr_ptr res, const gr_mat_t mat, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_det_generic_field(gr_ptr res, const gr_mat_t A, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_det_generic_integral_domain(gr_ptr res, const gr_mat_t A, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_det_generic(gr_ptr res, const gr_mat_t A, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_det(gr_ptr res, const gr_mat_t A, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_det(gr_ptr res, const gr_mat_t mat, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_inv(gr_mat_t res, const gr_mat_t mat, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_adjugate_charpoly(gr_mat_t adj, gr_ptr det, const gr_mat_t A, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_adjugate_cofactor(gr_mat_t adj, gr_ptr det, const gr_mat_t A, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_adjugate(gr_mat_t adj, gr_ptr det, const gr_mat_t A, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_adjugate_charpoly(gr_mat_t adj, gr_ptr det, const gr_mat_t mat, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_adjugate_cofactor(gr_mat_t adj, gr_ptr det, const gr_mat_t mat, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_adjugate(gr_mat_t adj, gr_ptr det, const gr_mat_t mat, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_rank_lu(slong * rank, const gr_mat_t A, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_rank_fflu(slong * rank, const gr_mat_t A, gr_ctx_t ctx); @@ -207,11 +207,11 @@ WARN_UNUSED_RESULT int gr_mat_rref_den(slong * res_rank, gr_mat_t R, gr_ptr den, WARN_UNUSED_RESULT int gr_mat_nullspace(gr_mat_t X, const gr_mat_t A, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_ones(gr_mat_t mat, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_pascal(gr_mat_t mat, int triangular, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_stirling(gr_mat_t mat, int kind, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_hilbert(gr_mat_t mat, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_hadamard(gr_mat_t mat, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_ones(gr_mat_t res, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_pascal(gr_mat_t res, int triangular, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_stirling(gr_mat_t res, int kind, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_hilbert(gr_mat_t res, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_hadamard(gr_mat_t res, gr_ctx_t ctx); /* todo: dft, dct */ WARN_UNUSED_RESULT int gr_mat_transpose(gr_mat_t B, const gr_mat_t A, gr_ctx_t ctx); @@ -240,13 +240,13 @@ WARN_UNUSED_RESULT int _gr_mat_charpoly_faddeev_bsgs(gr_ptr res, gr_mat_t adj, c WARN_UNUSED_RESULT int gr_mat_charpoly_faddeev_bsgs(gr_poly_t res, gr_mat_t adj, const gr_mat_t mat, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_mat_charpoly_from_hessenberg(gr_ptr res, const gr_mat_t mat, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_charpoly_from_hessenberg(gr_poly_t cp, const gr_mat_t mat, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_charpoly_from_hessenberg(gr_poly_t res, const gr_mat_t mat, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_mat_charpoly_gauss(gr_ptr res, const gr_mat_t mat, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_charpoly_gauss(gr_poly_t cp, const gr_mat_t mat, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_charpoly_gauss(gr_poly_t res, const gr_mat_t mat, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_mat_charpoly_householder(gr_ptr res, const gr_mat_t mat, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_charpoly_householder(gr_poly_t cp, const gr_mat_t mat, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_charpoly_householder(gr_poly_t res, const gr_mat_t mat, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_mat_charpoly(gr_ptr res, const gr_mat_t mat, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_charpoly(gr_poly_t res, const gr_mat_t mat, gr_ctx_t ctx); @@ -257,8 +257,8 @@ WARN_UNUSED_RESULT int gr_mat_hessenberg_householder(gr_mat_t res, const gr_mat_ truth_t gr_mat_is_hessenberg(const gr_mat_t mat, gr_ctx_t ctx); int gr_mat_reduce_row(slong * column, gr_mat_t A, slong * P, slong * L, slong m, gr_ctx_t ctx); -int gr_mat_apply_row_similarity(gr_mat_t A, slong r, gr_ptr d, gr_ctx_t ctx); -int gr_mat_minpoly_field(gr_poly_t p, const gr_mat_t X, gr_ctx_t ctx); +int gr_mat_apply_row_similarity(gr_mat_t M, slong r, gr_ptr d, gr_ctx_t ctx); +int gr_mat_minpoly_field(gr_poly_t res, const gr_mat_t mat, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_eigenvalues(gr_vec_t lambda, gr_vec_t mult, const gr_mat_t mat, int flags, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_eigenvalues_other(gr_vec_t lambda, gr_vec_t mult, const gr_mat_t mat, gr_ctx_t mat_ctx, int flags, gr_ctx_t ctx); @@ -277,8 +277,8 @@ truth_t gr_mat_is_diagonal(const gr_mat_t mat, gr_ctx_t ctx); truth_t gr_mat_is_lower_triangular(const gr_mat_t mat, gr_ctx_t ctx); truth_t gr_mat_is_upper_triangular(const gr_mat_t mat, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_mul_diag(gr_mat_t C, const gr_mat_t A, const gr_vec_t D, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_mat_diag_mul(gr_mat_t C, const gr_vec_t D, const gr_mat_t A, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_mul_diag(gr_mat_t res, const gr_mat_t A, const gr_vec_t D, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_mat_diag_mul(gr_mat_t res, const gr_vec_t D, const gr_mat_t A, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_exp_jordan(gr_mat_t res, const gr_mat_t A, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_mat_exp(gr_mat_t res, const gr_mat_t A, gr_ctx_t ctx); diff --git a/src/gr_mpoly.h b/src/gr_mpoly.h index 2563e5e758..da524e75b8 100644 --- a/src/gr_mpoly.h +++ b/src/gr_mpoly.h @@ -210,8 +210,8 @@ WARN_UNUSED_RESULT int gr_mpoly_neg(gr_mpoly_t A, const gr_mpoly_t B, const mpol WARN_UNUSED_RESULT int gr_mpoly_add(gr_mpoly_t A, const gr_mpoly_t B, const gr_mpoly_t C, const mpoly_ctx_t mctx, gr_ctx_t cctx); WARN_UNUSED_RESULT int gr_mpoly_sub(gr_mpoly_t A, const gr_mpoly_t B, const gr_mpoly_t C, const mpoly_ctx_t mctx, gr_ctx_t cctx); -WARN_UNUSED_RESULT int gr_mpoly_mul(gr_mpoly_t poly1, const gr_mpoly_t poly2, const gr_mpoly_t poly3, const mpoly_ctx_t mctx, gr_ctx_t cctx); -WARN_UNUSED_RESULT int gr_mpoly_mul_johnson(gr_mpoly_t poly1, const gr_mpoly_t poly2, const gr_mpoly_t poly3, const mpoly_ctx_t mctx, gr_ctx_t cctx); +WARN_UNUSED_RESULT int gr_mpoly_mul(gr_mpoly_t A, const gr_mpoly_t B, const gr_mpoly_t C, const mpoly_ctx_t mctx, gr_ctx_t cctx); +WARN_UNUSED_RESULT int gr_mpoly_mul_johnson(gr_mpoly_t A, const gr_mpoly_t B, const gr_mpoly_t C, const mpoly_ctx_t mctx, gr_ctx_t cctx); WARN_UNUSED_RESULT int gr_mpoly_mul_monomial(gr_mpoly_t A, const gr_mpoly_t B, const gr_mpoly_t C, const mpoly_ctx_t mctx, gr_ctx_t cctx); WARN_UNUSED_RESULT int gr_mpoly_mul_scalar(gr_mpoly_t A, const gr_mpoly_t B, gr_srcptr c, const mpoly_ctx_t mctx, gr_ctx_t cctx); diff --git a/src/gr_poly.h b/src/gr_poly.h index 30bc4186db..78576356f7 100644 --- a/src/gr_poly.h +++ b/src/gr_poly.h @@ -73,7 +73,7 @@ WARN_UNUSED_RESULT int gr_poly_set(gr_poly_t res, const gr_poly_t src, gr_ctx_t WARN_UNUSED_RESULT int _gr_poly_reverse(gr_ptr res, gr_srcptr poly, slong len, slong n, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_poly_reverse(gr_poly_t res, const gr_poly_t poly, slong n, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_truncate(gr_poly_t poly, const gr_poly_t src, slong newlen, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_truncate(gr_poly_t res, const gr_poly_t poly, slong newlen, gr_ctx_t ctx); GR_POLY_INLINE WARN_UNUSED_RESULT int gr_poly_zero(gr_poly_t poly, gr_ctx_t ctx) @@ -99,22 +99,22 @@ truth_t gr_poly_is_one(const gr_poly_t poly, gr_ctx_t ctx); truth_t gr_poly_is_gen(const gr_poly_t poly, gr_ctx_t ctx); truth_t gr_poly_is_scalar(const gr_poly_t poly, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_set_scalar(gr_poly_t poly, gr_srcptr x, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_set_si(gr_poly_t poly, slong x, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_set_ui(gr_poly_t poly, ulong x, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_set_fmpz(gr_poly_t poly, const fmpz_t x, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_set_fmpq(gr_poly_t poly, const fmpq_t x, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_set_scalar(gr_poly_t poly, gr_srcptr c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_set_si(gr_poly_t poly, slong c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_set_ui(gr_poly_t poly, ulong c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_set_fmpz(gr_poly_t poly, const fmpz_t c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_set_fmpq(gr_poly_t poly, const fmpq_t c, gr_ctx_t ctx); /* todo: test */ WARN_UNUSED_RESULT int gr_poly_set_fmpz_poly(gr_poly_t res, const fmpz_poly_t src, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_poly_set_fmpq_poly(gr_poly_t res, const fmpq_poly_t src, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_poly_set_gr_poly_other(gr_poly_t res, const gr_poly_t x, gr_ctx_t x_ctx, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_set_coeff_scalar(gr_poly_t poly, slong n, gr_srcptr x, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_set_coeff_si(gr_poly_t poly, slong n, slong x, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_set_coeff_ui(gr_poly_t poly, slong n, ulong x, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_set_coeff_fmpz(gr_poly_t poly, slong n, const fmpz_t x, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_set_coeff_fmpq(gr_poly_t poly, slong n, const fmpq_t x, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_set_coeff_scalar(gr_poly_t poly, slong n, gr_srcptr c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_set_coeff_si(gr_poly_t poly, slong n, slong c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_set_coeff_ui(gr_poly_t poly, slong n, ulong c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_set_coeff_fmpz(gr_poly_t poly, slong n, const fmpz_t c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_set_coeff_fmpq(gr_poly_t poly, slong n, const fmpq_t c, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_poly_get_coeff_scalar(gr_ptr res, const gr_poly_t poly, slong n, gr_ctx_t ctx); @@ -129,9 +129,9 @@ WARN_UNUSED_RESULT int gr_poly_sub(gr_poly_t res, const gr_poly_t poly1, const g WARN_UNUSED_RESULT int _gr_poly_mul(gr_ptr res, gr_srcptr poly1, slong len1, gr_srcptr poly2, slong len2, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_poly_mul(gr_poly_t res, const gr_poly_t poly1, const gr_poly_t poly2, gr_ctx_t ctx); -WARN_UNUSED_RESULT int _gr_poly_mullow_generic(gr_ptr res, gr_srcptr poly1, slong len1, gr_srcptr poly2, slong len2, slong n, gr_ctx_t ctx); +WARN_UNUSED_RESULT int _gr_poly_mullow_generic(gr_ptr res, gr_srcptr poly1, slong len1, gr_srcptr poly2, slong len2, slong len, gr_ctx_t ctx); GR_POLY_INLINE WARN_UNUSED_RESULT int _gr_poly_mullow(gr_ptr res, gr_srcptr poly1, slong len1, gr_srcptr poly2, slong len2, slong len, gr_ctx_t ctx) { return GR_POLY_BINARY_TRUNC_OP(ctx, POLY_MULLOW)(res, poly1, len1, poly2, len2, len, ctx); } -WARN_UNUSED_RESULT int gr_poly_mullow(gr_poly_t res, const gr_poly_t poly1, const gr_poly_t poly2, slong n, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_mullow(gr_poly_t res, const gr_poly_t poly1, const gr_poly_t poly2, slong len, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_poly_mul_scalar(gr_poly_t res, const gr_poly_t poly, gr_srcptr c, gr_ctx_t ctx); /* powering */ @@ -206,34 +206,34 @@ WARN_UNUSED_RESULT int gr_poly_rem(gr_poly_t R, const gr_poly_t A, const gr_poly /* todo: div with fast divisibility checking; rem; divexact */ -WARN_UNUSED_RESULT int _gr_poly_inv_series_newton(gr_ptr Qinv, gr_srcptr Q, slong Qlen, slong len, slong cutoff, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_inv_series_newton(gr_poly_t Qinv, const gr_poly_t Q, slong len, slong cutoff, gr_ctx_t ctx); +WARN_UNUSED_RESULT int _gr_poly_inv_series_newton(gr_ptr res, gr_srcptr A, slong Alen, slong len, slong cutoff, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_inv_series_newton(gr_poly_t res, const gr_poly_t A, slong len, slong cutoff, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_inv_series_basecase_preinv1(gr_ptr res, gr_srcptr A, slong Alen, gr_srcptr Ainv, slong len, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_inv_series_basecase_generic(gr_ptr Qinv, gr_srcptr Q, slong Qlen, slong len, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_inv_series_basecase(gr_poly_t Qinv, const gr_poly_t Q, slong len, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_inv_series_basecase(gr_poly_t res, const gr_poly_t A, slong len, gr_ctx_t ctx); GR_POLY_INLINE WARN_UNUSED_RESULT int _gr_poly_inv_series_basecase(gr_ptr res, gr_srcptr f, slong flen, slong len, gr_ctx_t ctx) { return GR_POLY_UNARY_TRUNC_OP(ctx, POLY_INV_SERIES_BASECASE)(res, f, flen, len, ctx); } GR_POLY_INLINE WARN_UNUSED_RESULT int _gr_poly_inv_series(gr_ptr res, gr_srcptr f, slong flen, slong len, gr_ctx_t ctx) { return GR_POLY_UNARY_TRUNC_OP(ctx, POLY_INV_SERIES)(res, f, flen, len, ctx); } WARN_UNUSED_RESULT int _gr_poly_inv_series_generic(gr_ptr Qinv, gr_srcptr Q, slong Qlen, slong len, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_inv_series(gr_poly_t Qinv, const gr_poly_t Q, slong len, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_inv_series(gr_poly_t res, const gr_poly_t A, slong len, gr_ctx_t ctx); -WARN_UNUSED_RESULT int _gr_poly_div_series_newton(gr_ptr res, gr_srcptr B, slong Blen, gr_srcptr A, slong Alen, slong len, slong cutoff, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_div_series_newton(gr_poly_t Q, const gr_poly_t A, const gr_poly_t B, slong len, slong cutoff, gr_ctx_t ctx); +WARN_UNUSED_RESULT int _gr_poly_div_series_newton(gr_ptr res, gr_srcptr A, slong Alen, gr_srcptr B, slong Blen, slong len, slong cutoff, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_div_series_newton(gr_poly_t res, const gr_poly_t A, const gr_poly_t B, slong len, slong cutoff, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_div_series_divconquer(gr_ptr res, gr_srcptr B, slong Blen, gr_srcptr A, slong Alen, slong len, slong cutoff, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_poly_div_series_divconquer(gr_poly_t Q, const gr_poly_t A, const gr_poly_t B, slong len, slong cutoff, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_div_series_basecase_generic(gr_ptr Q, gr_srcptr A, slong Alen, gr_srcptr B, slong Blen, slong len, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_div_series_basecase(gr_poly_t Q, const gr_poly_t A, const gr_poly_t B, slong len, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_div_series_basecase(gr_poly_t res, const gr_poly_t A, const gr_poly_t B, slong len, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_div_series_basecase_preinv1(gr_ptr Q, gr_srcptr A, slong Alen, gr_srcptr B, slong Blen, gr_srcptr Binv, slong len, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_div_series_basecase_noinv(gr_ptr Q, gr_srcptr A, slong Alen, gr_srcptr B, slong Blen, slong len, gr_ctx_t ctx); -WARN_UNUSED_RESULT int _gr_poly_div_series_invmul(gr_ptr Q, gr_srcptr A, slong Alen, gr_srcptr B, slong Blen, slong len, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_div_series_invmul(gr_poly_t Q, const gr_poly_t A, const gr_poly_t B, slong len, gr_ctx_t ctx); +WARN_UNUSED_RESULT int _gr_poly_div_series_invmul(gr_ptr res, gr_srcptr B, slong Blen, gr_srcptr A, slong Alen, slong len, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_div_series_invmul(gr_poly_t res, const gr_poly_t A, const gr_poly_t B, slong len, gr_ctx_t ctx); GR_POLY_INLINE WARN_UNUSED_RESULT int _gr_poly_div_series_basecase(gr_ptr res, gr_srcptr f, slong flen, gr_srcptr g, slong glen, slong len, gr_ctx_t ctx) { return GR_POLY_BINARY_TRUNC_OP(ctx, POLY_DIV_SERIES_BASECASE)(res, f, flen, g, glen, len, ctx); } GR_POLY_INLINE WARN_UNUSED_RESULT int _gr_poly_div_series(gr_ptr res, gr_srcptr f, slong flen, gr_srcptr g, slong glen, slong len, gr_ctx_t ctx) { return GR_POLY_BINARY_TRUNC_OP(ctx, POLY_DIV_SERIES)(res, f, flen, g, glen, len, ctx); } WARN_UNUSED_RESULT int _gr_poly_div_series_generic(gr_ptr Q, gr_srcptr A, slong Alen, gr_srcptr B, slong Blen, slong len, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_div_series(gr_poly_t Q, const gr_poly_t A, const gr_poly_t B, slong len, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_div_series(gr_poly_t res, const gr_poly_t A, const gr_poly_t B, slong len, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_divexact_basecase_bidirectional(gr_ptr Q, gr_srcptr A, slong Alen, gr_srcptr B, slong Blen, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_poly_divexact_basecase_bidirectional(gr_poly_t Q, const gr_poly_t A, const gr_poly_t B, gr_ctx_t ctx); @@ -285,22 +285,22 @@ WARN_UNUSED_RESULT int _gr_poly_evaluate(gr_ptr res, gr_srcptr poly, slong len, WARN_UNUSED_RESULT int gr_poly_evaluate(gr_ptr res, const gr_poly_t poly, gr_srcptr x, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_evaluate_other_horner(gr_ptr res, gr_srcptr f, slong len, const gr_srcptr x, gr_ctx_t x_ctx, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_evaluate_other_horner(gr_ptr res, const gr_poly_t f, gr_srcptr a, gr_ctx_t a_ctx, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_evaluate_other_horner(gr_ptr res, const gr_poly_t f, gr_srcptr x, gr_ctx_t x_ctx, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_evaluate_other_rectangular(gr_ptr res, gr_srcptr f, slong len, const gr_srcptr x, gr_ctx_t x_ctx, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_evaluate_other_rectangular(gr_ptr res, const gr_poly_t f, gr_srcptr a, gr_ctx_t a_ctx, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_evaluate_other_rectangular(gr_ptr res, const gr_poly_t f, gr_srcptr x, gr_ctx_t x_ctx, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_evaluate_other(gr_ptr res, gr_srcptr f, slong len, const gr_srcptr x, gr_ctx_t x_ctx, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_evaluate_other(gr_ptr res, const gr_poly_t f, gr_srcptr a, gr_ctx_t a_ctx, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_evaluate_other(gr_ptr res, const gr_poly_t f, gr_srcptr x, gr_ctx_t x_ctx, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_taylor_shift_horner(gr_ptr res, gr_srcptr poly, slong len, gr_srcptr c, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_taylor_shift_horner(gr_poly_t res, const gr_poly_t f, gr_srcptr c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_taylor_shift_horner(gr_poly_t res, const gr_poly_t poly, gr_srcptr c, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_taylor_shift_divconquer(gr_ptr res, gr_srcptr poly, slong len, gr_srcptr c, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_taylor_shift_divconquer(gr_poly_t res, const gr_poly_t f, gr_srcptr c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_taylor_shift_divconquer(gr_poly_t res, const gr_poly_t poly, gr_srcptr c, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_taylor_shift_convolution(gr_ptr res, gr_srcptr poly, slong len, gr_srcptr c, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_taylor_shift_convolution(gr_poly_t res, const gr_poly_t f, gr_srcptr c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_taylor_shift_convolution(gr_poly_t res, const gr_poly_t poly, gr_srcptr c, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_taylor_shift_generic(gr_ptr res, gr_srcptr poly, slong len, gr_srcptr c, gr_ctx_t ctx); GR_POLY_INLINE WARN_UNUSED_RESULT int _gr_poly_taylor_shift(gr_ptr res, gr_srcptr f, slong len, gr_srcptr c, gr_ctx_t ctx) { return GR_VEC_SCALAR_OP(ctx, POLY_TAYLOR_SHIFT)(res, f, len, c, ctx); } WARN_UNUSED_RESULT int _gr_poly_taylor_shift(gr_ptr res, gr_srcptr poly, slong len, gr_srcptr c, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_taylor_shift(gr_poly_t res, const gr_poly_t f, gr_srcptr c, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_taylor_shift(gr_poly_t res, const gr_poly_t poly, gr_srcptr c, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_compose_horner(gr_ptr res, gr_srcptr poly1, slong len1, gr_srcptr poly2, slong len2, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_poly_compose_horner(gr_poly_t res, const gr_poly_t poly1, const gr_poly_t poly2, gr_ctx_t ctx); @@ -361,19 +361,19 @@ WARN_UNUSED_RESULT int _gr_poly_xgcd_hgcd(slong * Glen, gr_ptr G, gr_ptr S, gr_p WARN_UNUSED_RESULT int gr_poly_xgcd_hgcd(gr_poly_t G, gr_poly_t S, gr_poly_t T, const gr_poly_t A, const gr_poly_t B, slong hgcd_cutoff, slong cutoff, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_resultant_euclidean(gr_ptr res, gr_srcptr poly1, slong len1, gr_srcptr poly2, slong len2, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_resultant_euclidean(gr_ptr r, const gr_poly_t f, const gr_poly_t g, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_resultant_euclidean(gr_ptr res, const gr_poly_t f, const gr_poly_t g, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_resultant_hgcd(gr_ptr res, gr_srcptr A, slong lenA, gr_srcptr B, slong lenB, slong inner_cutoff, slong cutoff, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_resultant_hgcd(gr_ptr r, const gr_poly_t f, const gr_poly_t g, slong inner_cutoff, slong cutoff, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_resultant_hgcd(gr_ptr res, const gr_poly_t f, const gr_poly_t g, slong inner_cutoff, slong cutoff, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_resultant_sylvester(gr_ptr res, gr_srcptr poly1, slong len1, gr_srcptr poly2, slong len2, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_resultant_sylvester(gr_ptr r, const gr_poly_t f, const gr_poly_t g, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_resultant_sylvester(gr_ptr res, const gr_poly_t f, const gr_poly_t g, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_resultant_small(gr_ptr res, gr_srcptr poly1, slong len1, gr_srcptr poly2, slong len2, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_resultant_small(gr_ptr r, const gr_poly_t f, const gr_poly_t g, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_resultant_small(gr_ptr res, const gr_poly_t f, const gr_poly_t g, gr_ctx_t ctx); WARN_UNUSED_RESULT int _gr_poly_resultant(gr_ptr res, gr_srcptr poly1, slong len1, gr_srcptr poly2, slong len2, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_poly_resultant(gr_ptr r, const gr_poly_t f, const gr_poly_t g, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_poly_resultant(gr_ptr res, const gr_poly_t f, const gr_poly_t g, gr_ctx_t ctx); /* Multipoint evaluation/interpolation */ @@ -391,7 +391,7 @@ WARN_UNUSED_RESULT int gr_poly_evaluate_vec_iter(gr_vec_t ys, const gr_poly_t po /* Squarefree factorization */ -int gr_poly_factor_squarefree(gr_ptr c, gr_vec_t fac, gr_vec_t exp, const gr_poly_t F, gr_ctx_t ctx); +int gr_poly_factor_squarefree(gr_ptr c, gr_vec_t fac, gr_vec_t exp, const gr_poly_t poly, gr_ctx_t ctx); int gr_poly_squarefree_part(gr_poly_t res, const gr_poly_t poly, gr_ctx_t ctx); /* Roots */ diff --git a/src/gr_vec.h b/src/gr_vec.h index 363c65c7f0..23527ff9f6 100644 --- a/src/gr_vec.h +++ b/src/gr_vec.h @@ -50,7 +50,7 @@ GR_VEC_INLINE slong gr_vec_length(const gr_vec_t vec, gr_ctx_t ctx) void gr_vec_fit_length(gr_vec_t vec, slong len, gr_ctx_t ctx); void gr_vec_set_length(gr_vec_t vec, slong len, gr_ctx_t ctx); WARN_UNUSED_RESULT int gr_vec_set(gr_vec_t res, const gr_vec_t src, gr_ctx_t ctx); -WARN_UNUSED_RESULT int gr_vec_append(gr_vec_t vec, gr_srcptr f, gr_ctx_t ctx); +WARN_UNUSED_RESULT int gr_vec_append(gr_vec_t vec, gr_srcptr x, gr_ctx_t ctx); int _gr_vec_write(gr_stream_t out, gr_srcptr vec, slong len, gr_ctx_t ctx); int gr_vec_write(gr_stream_t out, const gr_vec_t vec, gr_ctx_t ctx); diff --git a/src/hypgeom.h b/src/hypgeom.h index 5e34ccb05b..49791ccd14 100644 --- a/src/hypgeom.h +++ b/src/hypgeom.h @@ -44,14 +44,14 @@ void hypgeom_clear(hypgeom_t hyp); void hypgeom_precompute(hypgeom_t hyp); -slong hypgeom_estimate_terms(const mag_t z, int r, slong prec); +slong hypgeom_estimate_terms(const mag_t z, int r, slong d); slong hypgeom_bound(mag_t error, int r, slong C, slong D, slong K, const mag_t TK, const mag_t z, slong prec); void arb_hypgeom_sum(arb_t P, arb_t Q, const hypgeom_t hyp, slong n, slong prec); -void arb_hypgeom_infsum(arb_t P, arb_t Q, hypgeom_t hyp, slong target_prec, slong prec); +void arb_hypgeom_infsum(arb_t P, arb_t Q, hypgeom_t hyp, slong tol, slong prec); #ifdef __cplusplus } diff --git a/src/mag.h b/src/mag.h index 0122941051..b20ccfe037 100644 --- a/src/mag.h +++ b/src/mag.h @@ -260,25 +260,25 @@ mag_equal(const mag_t x, const mag_t y) /* general versions */ -void mag_mul(mag_t z, const mag_t x, const mag_t y); +void mag_mul(mag_t res, const mag_t x, const mag_t y); -void mag_mul_lower(mag_t z, const mag_t x, const mag_t y); +void mag_mul_lower(mag_t res, const mag_t x, const mag_t y); void mag_addmul(mag_t z, const mag_t x, const mag_t y); -void mag_add_2exp_fmpz(mag_t z, const mag_t x, const fmpz_t e); +void mag_add_2exp_fmpz(mag_t res, const mag_t x, const fmpz_t e); -void mag_add(mag_t z, const mag_t x, const mag_t y); +void mag_add(mag_t res, const mag_t x, const mag_t y); -void mag_add_lower(mag_t z, const mag_t x, const mag_t y); +void mag_add_lower(mag_t res, const mag_t x, const mag_t y); -void mag_add_ui(mag_t z, const mag_t x, ulong y); +void mag_add_ui(mag_t res, const mag_t x, ulong y); void mag_add_ui_lower(mag_t res, const mag_t x, ulong y); -void mag_add_ui_2exp_si(mag_t z, const mag_t x, ulong y, slong e); +void mag_add_ui_2exp_si(mag_t res, const mag_t x, ulong y, slong e); -void mag_div(mag_t z, const mag_t x, const mag_t y); -void mag_div_lower(mag_t z, const mag_t x, const mag_t y); +void mag_div(mag_t res, const mag_t x, const mag_t y); +void mag_div_lower(mag_t res, const mag_t x, const mag_t y); MAG_INLINE void mag_inv(mag_t res, const mag_t x) @@ -298,13 +298,13 @@ mag_inv_lower(mag_t res, const mag_t x) mag_div_lower(res, t, x); } -void mag_mul_2exp_si(mag_t z, const mag_t x, slong y); +void mag_mul_2exp_si(mag_t res, const mag_t x, slong y); -void mag_mul_2exp_fmpz(mag_t z, const mag_t x, const fmpz_t y); +void mag_mul_2exp_fmpz(mag_t res, const mag_t x, const fmpz_t y); -void mag_sub(mag_t z, const mag_t x, const mag_t y); +void mag_sub(mag_t res, const mag_t x, const mag_t y); -void mag_sub_lower(mag_t z, const mag_t x, const mag_t y); +void mag_sub_lower(mag_t res, const mag_t x, const mag_t y); /* Fast versions (no infs/nans, small exponents). Note that this applies to outputs too! */ @@ -470,16 +470,16 @@ mag_fast_add_2exp_si(mag_t z, const mag_t x, slong e) (exp) = (xexp) + __cexp - __fix; \ } while (0); -void mag_set_d(mag_t z, double x); -void mag_set_d_lower(mag_t z, double x); -void mag_set_d_2exp_fmpz(mag_t z, double c, const fmpz_t exp); -void mag_set_d_2exp_fmpz_lower(mag_t z, double c, const fmpz_t exp); +void mag_set_d(mag_t res, double x); +void mag_set_d_lower(mag_t res, double x); +void mag_set_d_2exp_fmpz(mag_t res, double x, const fmpz_t y); +void mag_set_d_2exp_fmpz_lower(mag_t res, double x, const fmpz_t y); -void mag_set_fmpz_2exp_fmpz(mag_t z, const fmpz_t man, const fmpz_t exp); +void mag_set_fmpz_2exp_fmpz(mag_t res, const fmpz_t x, const fmpz_t y); -void mag_randtest_special(mag_t x, flint_rand_t state, slong expbits); +void mag_randtest_special(mag_t res, flint_rand_t state, slong expbits); -void mag_randtest(mag_t x, flint_rand_t state, slong expbits); +void mag_randtest(mag_t res, flint_rand_t state, slong expbits); #ifdef FLINT_HAVE_FILE void mag_fprint(FILE * file, const mag_t x); @@ -489,14 +489,14 @@ void mag_fprintd(FILE * file, const mag_t x, slong d); void mag_print(const mag_t x); void mag_printd(const mag_t x, slong d); -void mag_get_fmpq(fmpq_t y, const mag_t x); +void mag_get_fmpq(fmpq_t res, const mag_t x); void mag_get_fmpz(fmpz_t res, const mag_t x); void mag_get_fmpz_lower(fmpz_t res, const mag_t x); int mag_cmp(const mag_t x, const mag_t y); -int mag_cmp_2exp_si(const mag_t x, slong e); +int mag_cmp_2exp_si(const mag_t x, slong y); MAG_INLINE void mag_min(mag_t z, const mag_t x, const mag_t y) @@ -537,7 +537,7 @@ _mag_vec_clear(mag_ptr v, slong n) flint_free(v); } -double mag_get_d(const mag_t z); +double mag_get_d(const mag_t x); double mag_get_d_log2_approx(const mag_t x); @@ -545,34 +545,34 @@ double mag_get_d_log2_approx(const mag_t x); double mag_d_log_upper_bound(double x); double mag_d_log_lower_bound(double x); -void mag_log1p(mag_t z, const mag_t x); +void mag_log1p(mag_t res, const mag_t x); -void mag_log_ui(mag_t t, ulong n); +void mag_log_ui(mag_t res, ulong n); -void mag_log(mag_t z, const mag_t x); -void mag_log_lower(mag_t z, const mag_t x); -void mag_neg_log(mag_t z, const mag_t x); -void mag_neg_log_lower(mag_t z, const mag_t x); +void mag_log(mag_t res, const mag_t x); +void mag_log_lower(mag_t res, const mag_t x); +void mag_neg_log(mag_t res, const mag_t x); +void mag_neg_log_lower(mag_t res, const mag_t x); -void mag_exp(mag_t y, const mag_t x); -void mag_exp_lower(mag_t y, const mag_t x); +void mag_exp(mag_t res, const mag_t x); +void mag_exp_lower(mag_t res, const mag_t x); void mag_expinv(mag_t res, const mag_t x); -void mag_expinv_lower(mag_t y, const mag_t x); +void mag_expinv_lower(mag_t res, const mag_t x); -void mag_expm1(mag_t y, const mag_t x); -void mag_exp_tail(mag_t z, const mag_t x, ulong N); +void mag_expm1(mag_t res, const mag_t x); +void mag_exp_tail(mag_t res, const mag_t x, ulong N); -void mag_sinh(mag_t y, const mag_t x); -void mag_sinh_lower(mag_t y, const mag_t x); +void mag_sinh(mag_t res, const mag_t x); +void mag_sinh_lower(mag_t res, const mag_t x); -void mag_cosh(mag_t y, const mag_t x); -void mag_cosh_lower(mag_t y, const mag_t x); +void mag_cosh(mag_t res, const mag_t x); +void mag_cosh_lower(mag_t res, const mag_t x); -void mag_pow_ui(mag_t z, const mag_t x, ulong e); -void mag_pow_ui_lower(mag_t z, const mag_t x, ulong e); -void mag_pow_fmpz(mag_t z, const mag_t x, const fmpz_t e); -void mag_pow_fmpz_lower(mag_t z, const mag_t x, const fmpz_t e); +void mag_pow_ui(mag_t res, const mag_t x, ulong e); +void mag_pow_ui_lower(mag_t res, const mag_t x, ulong e); +void mag_pow_fmpz(mag_t res, const mag_t x, const fmpz_t e); +void mag_pow_fmpz_lower(mag_t res, const mag_t x, const fmpz_t e); void mag_const_pi(mag_t res); void mag_const_pi_lower(mag_t res); @@ -580,38 +580,38 @@ void mag_const_pi_lower(mag_t res); void mag_atan(mag_t res, const mag_t x); void mag_atan_lower(mag_t res, const mag_t x); -void mag_fac_ui(mag_t z, ulong n); -void mag_rfac_ui(mag_t z, ulong n); +void mag_fac_ui(mag_t res, ulong n); +void mag_rfac_ui(mag_t res, ulong n); void mag_bin_uiui(mag_t res, ulong n, ulong k); /* TODO: test */ -void mag_bernoulli_div_fac_ui(mag_t z, ulong n); +void mag_bernoulli_div_fac_ui(mag_t res, ulong n); /* TODO: test */ -void mag_set_fmpz_2exp_fmpz_lower(mag_t z, const fmpz_t man, const fmpz_t exp); +void mag_set_fmpz_2exp_fmpz_lower(mag_t res, const fmpz_t x, const fmpz_t y); -void mag_sqrt(mag_t y, const mag_t x); -void mag_sqrt_lower(mag_t y, const mag_t x); -void mag_rsqrt(mag_t y, const mag_t x); -void mag_rsqrt_lower(mag_t y, const mag_t x); +void mag_sqrt(mag_t res, const mag_t x); +void mag_sqrt_lower(mag_t res, const mag_t x); +void mag_rsqrt(mag_t res, const mag_t x); +void mag_rsqrt_lower(mag_t res, const mag_t x); -void mag_root(mag_t y, const mag_t x, ulong n); +void mag_root(mag_t res, const mag_t x, ulong n); -void mag_hypot(mag_t z, const mag_t x, const mag_t y); +void mag_hypot(mag_t res, const mag_t x, const mag_t y); -void mag_binpow_uiui(mag_t b, ulong m, ulong n); +void mag_binpow_uiui(mag_t res, ulong m, ulong n); -void mag_polylog_tail(mag_t u, const mag_t z, slong sigma, ulong d, ulong N); +void mag_polylog_tail(mag_t res, const mag_t z, slong s, ulong d, ulong N); -void mag_geom_series(mag_t res, const mag_t x, ulong n); +void mag_geom_series(mag_t res, const mag_t x, ulong N); void mag_hurwitz_zeta_uiui(mag_t res, ulong s, ulong a); -void mag_set_ui(mag_t z, ulong x); -void mag_set_ui_lower(mag_t z, ulong x); +void mag_set_ui(mag_t res, ulong x); +void mag_set_ui_lower(mag_t res, ulong x); /* TODO: test functions below */ -void mag_set_ui_2exp_si(mag_t z, ulong v, slong e); +void mag_set_ui_2exp_si(mag_t res, ulong x, slong y); MAG_INLINE void mag_set_fmpz(mag_t z, const fmpz_t x) diff --git a/src/mpfr_vec.h b/src/mpfr_vec.h index 15040479ab..7ab2543176 100644 --- a/src/mpfr_vec.h +++ b/src/mpfr_vec.h @@ -28,25 +28,25 @@ /* Soon to be deprecated */ #define flint_mpfr __mpfr_struct -mpfr_ptr _mpfr_vec_init(slong length, flint_bitcnt_t prec); +mpfr_ptr _mpfr_vec_init(slong len, flint_bitcnt_t prec); -void _mpfr_vec_clear(mpfr_ptr vec, slong length); +void _mpfr_vec_clear(mpfr_ptr vec, slong len); void _mpfr_vec_randtest(mpfr_ptr f, flint_rand_t state, slong len); -void _mpfr_vec_zero(mpfr_ptr vec, slong length); +void _mpfr_vec_zero(mpfr_ptr vec, slong len); -void _mpfr_vec_set(mpfr_ptr vec1, mpfr_srcptr vec2, slong length); +void _mpfr_vec_set(mpfr_ptr vec1, mpfr_srcptr vec2, slong len); int _mpfr_vec_equal(mpfr_srcptr vec1, mpfr_srcptr vec2, slong len); -void _mpfr_vec_add(mpfr_ptr res, mpfr_srcptr vec1, mpfr_srcptr vec2, slong length); +void _mpfr_vec_add(mpfr_ptr res, mpfr_srcptr vec1, mpfr_srcptr vec2, slong len); -void _mpfr_vec_scalar_mul_2exp(mpfr_ptr res, mpfr_srcptr vec, slong length, flint_bitcnt_t exp); +void _mpfr_vec_scalar_mul_2exp(mpfr_ptr res, mpfr_srcptr vec, slong len, flint_bitcnt_t exp); -void _mpfr_vec_scalar_mul_mpfr(mpfr_ptr res, mpfr_srcptr vec, slong length, mpfr_t c); +void _mpfr_vec_scalar_mul_mpfr(mpfr_ptr res, mpfr_srcptr vec, slong len, mpfr_t c); -void _mpfr_vec_scalar_product(mpfr_t res, mpfr_srcptr vec1, mpfr_srcptr vec2, slong length); +void _mpfr_vec_scalar_product(mpfr_t res, mpfr_srcptr vec1, mpfr_srcptr vec2, slong len); #ifdef __cplusplus } diff --git a/src/mpn_extras.h b/src/mpn_extras.h index 1c3a76f000..295f5f38e1 100644 --- a/src/mpn_extras.h +++ b/src/mpn_extras.h @@ -287,11 +287,11 @@ FLINT_DLL extern const flint_mpn_mul_func_t flint_mpn_mul_n_func_tab[]; FLINT_DLL extern const flint_mpn_sqr_func_t flint_mpn_sqr_func_tab[]; -void flint_mpn_mul_toom22(mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr); +void flint_mpn_mul_toom22(mp_ptr pp, mp_srcptr ap, mp_size_t an, mp_srcptr bp, mp_size_t bn, mp_ptr scratch); void flint_mpn_mul_toom32(mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr); -mp_limb_t _flint_mpn_mul(mp_ptr r, mp_srcptr x, mp_size_t xn, mp_srcptr y, mp_size_t yn); -void _flint_mpn_mul_n(mp_ptr r, mp_srcptr x, mp_srcptr y, mp_size_t n); +mp_limb_t _flint_mpn_mul(mp_ptr z, mp_srcptr x, mp_size_t xn, mp_srcptr y, mp_size_t yn); +void _flint_mpn_mul_n(mp_ptr z, mp_srcptr x, mp_srcptr y, mp_size_t n); mp_limb_t _flint_mpn_sqr(mp_ptr r, mp_srcptr x, mp_size_t n); MPN_EXTRAS_INLINE mp_limb_t @@ -397,7 +397,7 @@ FLINT_DLL extern const flint_mpn_mulhigh_normalised_func_t flint_mpn_mulhigh_nor #define FLINT_MPN_MULHIGH_MUL_CUTOFF 2000 #define FLINT_MPN_MULHIGH_K_TAB_SIZE 2048 -void _flint_mpn_mulhigh_n_mulders_recursive(mp_ptr rp, mp_srcptr np, mp_srcptr mp, mp_size_t n); +void _flint_mpn_mulhigh_n_mulders_recursive(mp_ptr res, mp_srcptr u, mp_srcptr v, mp_size_t n); /* NOTE: The x86_64_adx version of this function only works for n >= 6 */ # define FLINT_HAVE_NATIVE_mpn_mulhigh_basecase 1 @@ -467,9 +467,9 @@ MPN_EXTRAS_INLINE mp_limb_t _flint_mpn_sqrhigh_basecase(mp_ptr res, mp_srcptr u, #endif -void _flint_mpn_sqrhigh_mulders_recursive(mp_ptr rp, mp_srcptr np, mp_size_t n); +void _flint_mpn_sqrhigh_mulders_recursive(mp_ptr res, mp_srcptr u, mp_size_t n); mp_limb_t _flint_mpn_sqrhigh_mulders(mp_ptr res, mp_srcptr u, mp_size_t n); -mp_limb_t _flint_mpn_sqrhigh_basecase(mp_ptr rp, mp_srcptr xp, mp_size_t n); +mp_limb_t _flint_mpn_sqrhigh_basecase(mp_ptr res, mp_srcptr u, mp_size_t n); mp_limb_t flint_mpn_sqrhigh_basecase(mp_ptr rp, mp_srcptr xp, mp_size_t n); mp_limb_t _flint_mpn_sqrhigh_sqr(mp_ptr res, mp_srcptr u, mp_size_t n); mp_limb_t _flint_mpn_sqrhigh(mp_ptr, mp_srcptr, mp_size_t); diff --git a/src/nf_elem.h b/src/nf_elem.h index 0acf2cf40f..a63394cf80 100644 --- a/src/nf_elem.h +++ b/src/nf_elem.h @@ -273,7 +273,7 @@ int nf_elem_den_is_one(const nf_elem_t a, const nf_t nf) } -void _nf_elem_set_coeff_num_fmpz(nf_elem_t a, slong i, const fmpz_t b, const nf_t nf); +void _nf_elem_set_coeff_num_fmpz(nf_elem_t a, slong i, const fmpz_t d, const nf_t nf); /****************************************************************************** @@ -330,11 +330,11 @@ void nf_elem_add_qf(nf_elem_t a, const nf_elem_t b, void nf_elem_sub_qf(nf_elem_t a, const nf_elem_t b, const nf_elem_t c, const nf_t nf); -void _nf_elem_add(nf_elem_t a, const nf_elem_t b, const nf_elem_t c, const nf_t nf); -void nf_elem_add(nf_elem_t a, const nf_elem_t b, const nf_elem_t c, const nf_t nf); +void _nf_elem_add(nf_elem_t r, const nf_elem_t a, const nf_elem_t b, const nf_t nf); +void nf_elem_add(nf_elem_t r, const nf_elem_t a, const nf_elem_t b, const nf_t nf); -void _nf_elem_sub(nf_elem_t a, const nf_elem_t b, const nf_elem_t c, const nf_t nf); -void nf_elem_sub(nf_elem_t a, const nf_elem_t b, const nf_elem_t c, const nf_t nf); +void _nf_elem_sub(nf_elem_t r, const nf_elem_t a, const nf_elem_t b, const nf_t nf); +void nf_elem_sub(nf_elem_t r, const nf_elem_t a, const nf_elem_t b, const nf_t nf); void nf_elem_mul_gen(nf_elem_t a, const nf_elem_t b, const nf_t nf); @@ -350,15 +350,15 @@ void _nf_elem_mul_red(nf_elem_t a, const nf_elem_t b, void nf_elem_mul_red(nf_elem_t a, const nf_elem_t b, const nf_elem_t c, const nf_t nf, int red); -void _nf_elem_inv(nf_elem_t a, const nf_elem_t b, const nf_t nf); +void _nf_elem_inv(nf_elem_t r, const nf_elem_t a, const nf_t nf); -void nf_elem_inv(nf_elem_t a, const nf_elem_t b, const nf_t nf); +void nf_elem_inv(nf_elem_t r, const nf_elem_t a, const nf_t nf); void _nf_elem_div(nf_elem_t a, const nf_elem_t b, const nf_elem_t c, const nf_t nf); void nf_elem_div(nf_elem_t a, const nf_elem_t b, const nf_elem_t c, const nf_t nf); -void _nf_elem_pow(nf_elem_t res, const nf_elem_t b, ulong e, const nf_t nf); +void _nf_elem_pow(nf_elem_t res, const nf_elem_t a, ulong e, const nf_t nf); void nf_elem_pow(nf_elem_t res, const nf_elem_t a, ulong e, const nf_t nf); @@ -388,8 +388,8 @@ void nf_elem_rep_mat_fmpz_mat_den(fmpz_mat_t res, fmpz_t den, const nf_elem_t a, ******************************************************************************/ void _nf_elem_mod_fmpz(nf_elem_t res, const nf_elem_t a, const fmpz_t mod, const nf_t nf, int sign); -void nf_elem_mod_fmpz_den(nf_elem_t res, const nf_elem_t a, const fmpz_t mod, const nf_t nf, int den); -void nf_elem_smod_fmpz_den(nf_elem_t res, const nf_elem_t a, const fmpz_t mod, const nf_t nf, int den); +void nf_elem_mod_fmpz_den(nf_elem_t z, const nf_elem_t a, const fmpz_t mod, const nf_t nf, int den); +void nf_elem_smod_fmpz_den(nf_elem_t z, const nf_elem_t a, const fmpz_t mod, const nf_t nf, int den); void nf_elem_mod_fmpz(nf_elem_t res, const nf_elem_t a, const fmpz_t mod, const nf_t nf); void nf_elem_smod_fmpz(nf_elem_t res, const nf_elem_t a, const fmpz_t mod, const nf_t nf); void nf_elem_coprime_den(nf_elem_t res, const nf_elem_t a, const fmpz_t mod, const nf_t nf); diff --git a/src/nmod_mat.h b/src/nmod_mat.h index 629cc50541..844386d68f 100644 --- a/src/nmod_mat.h +++ b/src/nmod_mat.h @@ -93,7 +93,7 @@ void nmod_mat_randtest(nmod_mat_t mat, flint_rand_t state); void nmod_mat_randfull(nmod_mat_t mat, flint_rand_t state); int nmod_mat_randpermdiag(nmod_mat_t mat, flint_rand_t state, mp_srcptr diag, slong n); -void nmod_mat_randrank(nmod_mat_t, flint_rand_t state, slong rank); +void nmod_mat_randrank(nmod_mat_t mat, flint_rand_t state, slong rank); void nmod_mat_randops(nmod_mat_t mat, flint_rand_t state, slong count); void nmod_mat_randtril(nmod_mat_t mat, flint_rand_t state, int unit); void nmod_mat_randtriu(nmod_mat_t mat, flint_rand_t state, int unit); @@ -127,14 +127,14 @@ int nmod_mat_is_square(const nmod_mat_t mat) } -void nmod_mat_set(nmod_mat_t B, const nmod_mat_t A); +void nmod_mat_set(nmod_mat_t mat, const nmod_mat_t src); void nmod_mat_transpose(nmod_mat_t B, const nmod_mat_t A); /* Addition and subtraction */ void nmod_mat_add(nmod_mat_t C, const nmod_mat_t A, const nmod_mat_t B); void nmod_mat_sub(nmod_mat_t C, const nmod_mat_t A, const nmod_mat_t B); -void nmod_mat_neg(nmod_mat_t B, const nmod_mat_t A); +void nmod_mat_neg(nmod_mat_t A, const nmod_mat_t B); /* Matrix-scalar arithmetic */ diff --git a/src/nmod_mpoly.h b/src/nmod_mpoly.h index b7d582268b..cd626b7002 100644 --- a/src/nmod_mpoly.h +++ b/src/nmod_mpoly.h @@ -440,7 +440,7 @@ slong nmod_mpoly_degree_si(const nmod_mpoly_t A, slong var, const nmod_mpoly_ctx int nmod_mpoly_total_degree_fits_si(const nmod_mpoly_t A, const nmod_mpoly_ctx_t ctx); -void nmod_mpoly_total_degree_fmpz(fmpz_t td, const nmod_mpoly_t A, const nmod_mpoly_ctx_t ctx); +void nmod_mpoly_total_degree_fmpz(fmpz_t tdeg, const nmod_mpoly_t A, const nmod_mpoly_ctx_t ctx); slong nmod_mpoly_total_degree_si(const nmod_mpoly_t A, const nmod_mpoly_ctx_t ctx); void nmod_mpoly_used_vars(int * used, const nmod_mpoly_t A, const nmod_mpoly_ctx_t ctx); diff --git a/src/nmod_poly.h b/src/nmod_poly.h index cb2f8a3c96..ac8d0a5c2c 100644 --- a/src/nmod_poly.h +++ b/src/nmod_poly.h @@ -343,7 +343,7 @@ void nmod_poly_sub_series(nmod_poly_t res, void nmod_poly_sub_ui(nmod_poly_t res, const nmod_poly_t poly, ulong c); -void nmod_poly_neg(nmod_poly_t res, const nmod_poly_t poly1); +void nmod_poly_neg(nmod_poly_t res, const nmod_poly_t poly); /* Scalar multiplication and division ***************************************/ @@ -991,12 +991,12 @@ mp_limb_t nmod_poly_resultant_euclidean(const nmod_poly_t f, const nmod_poly_t g mp_limb_t _nmod_poly_resultant_hgcd(mp_srcptr A, slong lenA, mp_srcptr B, slong lenB, nmod_t mod); -mp_limb_t nmod_poly_resultant_hgcd(const nmod_poly_t A, const nmod_poly_t B); +mp_limb_t nmod_poly_resultant_hgcd(const nmod_poly_t f, const nmod_poly_t g); mp_limb_t _nmod_poly_resultant(mp_srcptr A, slong lenA, mp_srcptr B, slong lenB, nmod_t mod); -mp_limb_t nmod_poly_resultant(const nmod_poly_t A, const nmod_poly_t B); +mp_limb_t nmod_poly_resultant(const nmod_poly_t f, const nmod_poly_t g); slong _nmod_poly_gcdinv(mp_limb_t *G, mp_limb_t *S, @@ -1023,9 +1023,9 @@ void _nmod_poly_sqrt_series(mp_ptr g, mp_srcptr h, slong hlen, slong n, nmod_t m void nmod_poly_sqrt_series(nmod_poly_t g, const nmod_poly_t h, slong n); -int _nmod_poly_sqrt(mp_ptr s, mp_srcptr p, slong len, nmod_t mod); +int _nmod_poly_sqrt(mp_ptr s, mp_srcptr p, slong n, nmod_t mod); -int nmod_poly_sqrt(nmod_poly_t b, const nmod_poly_t a); +int nmod_poly_sqrt(nmod_poly_t s, const nmod_poly_t p); /* Power sums ****************************************************************/ @@ -1085,12 +1085,12 @@ void nmod_poly_cosh_series(nmod_poly_t g, const nmod_poly_t h, slong n); void _nmod_poly_tanh_series(mp_ptr g, mp_srcptr h, slong n, nmod_t mod); void nmod_poly_tanh_series(nmod_poly_t g, const nmod_poly_t h, slong n); -void _nmod_poly_log_series(mp_ptr res, mp_srcptr f, slong flen, slong n, nmod_t mod); -void nmod_poly_log_series(nmod_poly_t res, const nmod_poly_t f, slong n); +void _nmod_poly_log_series(mp_ptr g, mp_srcptr h, slong hlen, slong n, nmod_t mod); +void nmod_poly_log_series(nmod_poly_t g, const nmod_poly_t h, slong n); void _nmod_poly_exp_expinv_series(mp_ptr f, mp_ptr g, mp_srcptr h, slong hlen, slong n, nmod_t mod); void _nmod_poly_exp_series(mp_ptr f, mp_srcptr h, slong hlen, slong n, nmod_t mod); -void nmod_poly_exp_series(nmod_poly_t f, const nmod_poly_t h, slong n); +void nmod_poly_exp_series(nmod_poly_t g, const nmod_poly_t h, slong n); /* Special polynomials *******************************************************/ diff --git a/src/padic.h b/src/padic.h index 9a7f16ab72..425c7e04d4 100644 --- a/src/padic.h +++ b/src/padic.h @@ -242,9 +242,9 @@ void _padic_exp(fmpz_t rop, const fmpz_t u, slong v, const fmpz_t p, slong N); void _padic_exp_rectangular(fmpz_t rop, const fmpz_t u, slong v, const fmpz_t p, slong N); void _padic_exp_balanced(fmpz_t rop, const fmpz_t u, slong v, const fmpz_t p, slong N); -int padic_exp(padic_t rop, const padic_t op, const padic_ctx_t ctx); -int padic_exp_rectangular(padic_t rop, const padic_t op, const padic_ctx_t ctx); -int padic_exp_balanced(padic_t rop, const padic_t op, const padic_ctx_t ctx); +int padic_exp(padic_t y, const padic_t x, const padic_ctx_t ctx); +int padic_exp_rectangular(padic_t y, const padic_t x, const padic_ctx_t ctx); +int padic_exp_balanced(padic_t y, const padic_t x, const padic_ctx_t ctx); /* Logarithm *****************************************************************/ @@ -266,9 +266,9 @@ void _padic_teichmuller(fmpz_t rop, const fmpz_t op, const fmpz_t p, slong N); void padic_teichmuller(padic_t rop, const padic_t op, const padic_ctx_t ctx); -ulong padic_val_fac_ui_2(ulong N); +ulong padic_val_fac_ui_2(ulong n); -ulong padic_val_fac_ui(ulong N, const fmpz_t p); +ulong padic_val_fac_ui(ulong n, const fmpz_t p); void padic_val_fac(fmpz_t rop, const fmpz_t op, const fmpz_t p); diff --git a/src/padic_mat.h b/src/padic_mat.h index ce8e134072..b5439080f9 100644 --- a/src/padic_mat.h +++ b/src/padic_mat.h @@ -92,13 +92,13 @@ padic_mat_is_square(const padic_mat_t A) return padic_mat_nrows(A) == padic_mat_ncols(A); } -int padic_mat_is_canonical(const padic_mat_t A, const padic_ctx_t ctx); +int padic_mat_is_canonical(const padic_mat_t A, const padic_ctx_t p); int padic_mat_is_reduced(const padic_mat_t A, const padic_ctx_t ctx); /* Basic assignment **********************************************************/ -void padic_mat_set(padic_mat_t B, const padic_mat_t A, const padic_ctx_t ctx); +void padic_mat_set(padic_mat_t B, const padic_mat_t A, const padic_ctx_t p); void padic_mat_swap(padic_mat_t A, padic_mat_t B); diff --git a/src/padic_poly.h b/src/padic_poly.h index d552845444..4658150ff2 100644 --- a/src/padic_poly.h +++ b/src/padic_poly.h @@ -67,9 +67,9 @@ void padic_poly_init2(padic_poly_t poly, slong alloc, slong prec); void padic_poly_clear(padic_poly_t poly); -void padic_poly_realloc(padic_poly_t f, slong alloc, const fmpz_t p); +void padic_poly_realloc(padic_poly_t poly, slong alloc, const fmpz_t p); -void padic_poly_fit_length(padic_poly_t f, slong len); +void padic_poly_fit_length(padic_poly_t poly, slong len); PADIC_POLY_INLINE void _padic_poly_set_length(padic_poly_t poly, slong len) @@ -84,13 +84,13 @@ void _padic_poly_set_length(padic_poly_t poly, slong len) poly->length = len; } -void _padic_poly_normalise(padic_poly_t f); +void _padic_poly_normalise(padic_poly_t poly); void _padic_poly_canonicalise(fmpz *poly, slong *v, slong len, const fmpz_t p); void padic_poly_canonicalise(padic_poly_t poly, const fmpz_t p); -void padic_poly_reduce(padic_poly_t f, const padic_ctx_t ctx); +void padic_poly_reduce(padic_poly_t poly, const padic_ctx_t ctx); PADIC_POLY_INLINE void padic_poly_truncate(padic_poly_t poly, slong n, const fmpz_t p) @@ -202,7 +202,7 @@ void padic_poly_set_coeff_padic(padic_poly_t f, slong n, const padic_t c, /* Comparison **************************************************************/ -int padic_poly_equal(const padic_poly_t f, const padic_poly_t g); +int padic_poly_equal(const padic_poly_t poly1, const padic_poly_t poly2); PADIC_POLY_INLINE int padic_poly_is_zero(const padic_poly_t poly) { diff --git a/src/qadic.h b/src/qadic.h index 74d62eb5c3..2ce646f34b 100644 --- a/src/qadic.h +++ b/src/qadic.h @@ -352,13 +352,13 @@ void _qadic_inv(fmpz *rop, const fmpz *op, slong len, const fmpz *a, const slong *j, slong lena, const fmpz_t p, slong N); -void qadic_inv(qadic_t x, const qadic_t y, const qadic_ctx_t ctx); +void qadic_inv(qadic_t rop, const qadic_t op, const qadic_ctx_t ctx); void _qadic_pow(fmpz *rop, const fmpz *op, slong len, const fmpz_t e, const fmpz *a, const slong *j, slong lena, const fmpz_t p); -void qadic_pow(qadic_t x, const qadic_t y, const fmpz_t e, const qadic_ctx_t ctx); +void qadic_pow(qadic_t rop, const qadic_t op, const fmpz_t e, const qadic_ctx_t ctx); /* Special functions *********************************************************/ diff --git a/src/qqbar.h b/src/qqbar.h index a0b78ba165..6beb2bad3b 100644 --- a/src/qqbar.h +++ b/src/qqbar.h @@ -302,14 +302,14 @@ qqbar_sqr(qqbar_t res, const qqbar_t x) void qqbar_inv(qqbar_t res, const qqbar_t x); -void qqbar_mul_2exp_si(qqbar_t res, const qqbar_t x, slong exp); +void qqbar_mul_2exp_si(qqbar_t res, const qqbar_t x, slong e); -void qqbar_pow_ui(qqbar_t res, const qqbar_t x, ulong e); +void qqbar_pow_ui(qqbar_t res, const qqbar_t x, ulong n); void qqbar_pow_si(qqbar_t res, const qqbar_t x, slong n); void qqbar_pow_fmpz(qqbar_t res, const qqbar_t x, const fmpz_t n); void qqbar_pow_fmpq(qqbar_t res, const qqbar_t x, const fmpq_t n); -int qqbar_pow(qqbar_t res, const qqbar_t x, const qqbar_t e); +int qqbar_pow(qqbar_t res, const qqbar_t x, const qqbar_t y); /* Check if x = (p/q)^(1/n), p > 0 */ int _qqbar_fast_detect_simple_principal_surd(const qqbar_t x); @@ -336,8 +336,8 @@ qqbar_rsqrt(qqbar_t res, const qqbar_t x) qqbar_inv(res, res); } -void qqbar_fmpq_root_ui(qqbar_t res, const fmpq_t x, ulong b); -void qqbar_fmpq_pow_si_ui(qqbar_t res, const fmpq_t x, slong a, ulong b); +void qqbar_fmpq_root_ui(qqbar_t res, const fmpq_t x, ulong n); +void qqbar_fmpq_pow_si_ui(qqbar_t res, const fmpq_t x, slong m, ulong n); /* Numerical enclosure */ @@ -365,9 +365,9 @@ void _qqbar_evaluate_fmpz_poly(qqbar_t res, const fmpz * poly, slong len, const void qqbar_evaluate_fmpz_poly(qqbar_t res, const fmpz_poly_t poly, const qqbar_t x); -int qqbar_evaluate_fmpz_mpoly_iter(qqbar_t res, const fmpz_mpoly_t f, qqbar_srcptr x, slong deg_limit, slong bits_limit, const fmpz_mpoly_ctx_t ctx); -int qqbar_evaluate_fmpz_mpoly_horner(qqbar_t res, const fmpz_mpoly_t f, qqbar_srcptr x, slong deg_limit, slong bits_limit, const fmpz_mpoly_ctx_t ctx); -int qqbar_evaluate_fmpz_mpoly(qqbar_t res, const fmpz_mpoly_t f, qqbar_srcptr x, slong deg_limit, slong bits_limit, const fmpz_mpoly_ctx_t ctx); +int qqbar_evaluate_fmpz_mpoly_iter(qqbar_t res, const fmpz_mpoly_t poly, qqbar_srcptr x, slong deg_limit, slong bits_limit, const fmpz_mpoly_ctx_t ctx); +int qqbar_evaluate_fmpz_mpoly_horner(qqbar_t res, const fmpz_mpoly_t poly, qqbar_srcptr x, slong deg_limit, slong bits_limit, const fmpz_mpoly_ctx_t ctx); +int qqbar_evaluate_fmpz_mpoly(qqbar_t res, const fmpz_mpoly_t poly, qqbar_srcptr x, slong deg_limit, slong bits_limit, const fmpz_mpoly_ctx_t ctx); #define QQBAR_ROOTS_IRREDUCIBLE 1 #define QQBAR_ROOTS_UNSORTED 2 @@ -422,7 +422,7 @@ int qqbar_express_in_field(fmpq_poly_t res, const qqbar_t alpha, const qqbar_t x /* Conversions to radicals and expressions */ -void qqbar_get_quadratic(fmpz_t res_a, fmpz_t res_b, fmpz_t res_c, fmpz_t res_q, const qqbar_t x, int factoring); +void qqbar_get_quadratic(fmpz_t a, fmpz_t b, fmpz_t c, fmpz_t q, const qqbar_t x, int factoring); #ifdef FEXPR_H @@ -463,9 +463,9 @@ void qqbar_binary_op(qqbar_t res, const qqbar_t x, const qqbar_t y, int op); int _qqbar_validate_uniqueness(acb_t res, const fmpz_poly_t poly, const acb_t z, slong max_prec); -int _qqbar_validate_existence_uniqueness(acb_t res, const fmpz_poly_t poly, const acb_t z, slong prec); +int _qqbar_validate_existence_uniqueness(acb_t res, const fmpz_poly_t poly, const acb_t z, slong max_prec); -void _qqbar_enclosure_raw(acb_t res, const fmpz_poly_t poly, const acb_t zin, slong prec); +void _qqbar_enclosure_raw(acb_t res, const fmpz_poly_t poly, const acb_t z, slong prec); void qqbar_enclosure_raw(acb_t res, const qqbar_t x, slong prec); diff --git a/src/thread_pool.h b/src/thread_pool.h index b536ff86ef..964fd6a451 100644 --- a/src/thread_pool.h +++ b/src/thread_pool.h @@ -60,7 +60,7 @@ FLINT_DLL extern int global_thread_pool_initialized; void * thread_pool_idle_loop(void * varg); -void thread_pool_init(thread_pool_t T, slong l); +void thread_pool_init(thread_pool_t T, slong size); int thread_pool_set_affinity(thread_pool_t T, int * cpus, slong length); diff --git a/src/ulong_extras.h b/src/ulong_extras.h index a79831be4e..43c545eae1 100644 --- a/src/ulong_extras.h +++ b/src/ulong_extras.h @@ -43,7 +43,7 @@ ulong n_randtest_prime(flint_rand_t state, int proved); /* Basic arithmetic **********************************************************/ -ulong n_revbin(ulong in, ulong bits); +ulong n_revbin(ulong n, ulong b); int n_divides(mp_limb_t * q, mp_limb_t n, mp_limb_t p); ulong n_divrem2_precomp(ulong * q, ulong a, ulong n, double npre); @@ -59,8 +59,8 @@ int n_is_square(ulong x); int n_is_squarefree(ulong n); double n_cbrt_estimate(double a); -ulong n_cbrt(ulong a); -ulong n_cbrt_binary_search(ulong x); +ulong n_cbrt(ulong n); +ulong n_cbrt_binary_search(ulong n); ulong n_cbrt_newton_iteration(ulong n); ulong n_cbrt_chebyshev_approx(ulong n); ulong n_cbrtrem(ulong* remainder, ulong n);