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

tidying

Browse source
This commit is contained in:
Fredrik Johansson 2016-02-22 11:47:12 +01:00
parent 766867e28a
commit 8d7e82c3f6
3 changed files with 21 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
acb_dirichlet.h
View file

@ -59,7 +59,7 @@ void acb_dirichlet_group_init(acb_dirichlet_group_t G, ulong q);
void acb_dirichlet_group_clear(acb_dirichlet_group_t G);
void _acb_dirichlet_group_chi(acb_t res, const acb_dirichlet_group_t G, ulong m, ulong n, slong prec);
void acb_dirichlet_chi(acb_t res, const acb_dirichlet_group_t G, ulong m, ulong n, slong prec);
#ifdef __cplusplus
}

45
acb_dirichlet/group_chi.c → acb_dirichlet/chi.c
View file

@ -88,7 +88,7 @@ chi_even_exponent(const acb_dirichlet_group_t G, ulong m, ulong n)
}
void
_acb_dirichlet_group_chi(acb_t res, const acb_dirichlet_group_t G, ulong m, ulong n, slong prec)
acb_dirichlet_chi(acb_t res, const acb_dirichlet_group_t G, ulong m, ulong n, slong prec)
{
fmpq_t t, u;
@ -96,23 +96,15 @@ _acb_dirichlet_group_chi(acb_t res, const acb_dirichlet_group_t G, ulong m, ulon
ulong q_even = G->q_even;
ulong q_odd = G->q_odd;
odd_part = 0;
even_part = 0;
/* todo: check gcd before computing logarithms? */
if (q_even > 1)
if ((q_even > 1 && (n % 2 == 0)) || (q_odd > 1 && (n_gcd(q_odd, n) != 1)))
{
if (m % 2 == 0 || n % 2 == 0)
{
acb_zero(res);
return;
}
else if (q_even == 2)
{
even_part = 0; /* 1 */
}
else if (q_even == 4)
acb_zero(res);
return;
}
if (q_even > 2)
{
if (q_even == 4)
{
if (m % 4 == 3 && n % 4 == 3)
even_part = q_even / 2; /* -1 */
@ -124,20 +116,15 @@ _acb_dirichlet_group_chi(acb_t res, const acb_dirichlet_group_t G, ulong m, ulon
even_part = 4 * chi_even_exponent(G, m % q_even, n % q_even);
}
}
else
{
even_part = 0;
}
if (q_odd > 1)
{
m = m % q_odd;
n = n % q_odd;
if (n_gcd(q_odd, m) != 1 || n_gcd(q_odd, n) != 1)
{
acb_zero(res);
return;
}
odd_part = chi_odd_exponent(G, m, n);
}
odd_part = chi_odd_exponent(G, m % q_odd, n % q_odd);
else
odd_part = 0;
fmpq_init(t);
fmpq_init(u);

8
acb_dirichlet/test/t-dirichlet_group_chi.c → acb_dirichlet/test/t-chi.c
View file

@ -30,7 +30,7 @@ int main()
slong iter;
flint_rand_t state;
flint_printf("dirichlet_group_chi....");
flint_printf("chi....");
fflush(stdout);
flint_randinit(state);
@ -57,9 +57,9 @@ int main()
n1 = n_randint(state, 1000);
n2 = n_randint(state, 1000);
_acb_dirichlet_group_chi(zn1, G, m, n1, 53);
_acb_dirichlet_group_chi(zn2, G, m, n2, 53);
_acb_dirichlet_group_chi(zn1n2, G, m, n1 * n2, 53);
acb_dirichlet_chi(zn1, G, m, n1, 53);
acb_dirichlet_chi(zn2, G, m, n2, 53);
acb_dirichlet_chi(zn1n2, G, m, n1 * n2, 53);
acb_mul(zn1zn2, zn1, zn2, 53);
if (!acb_overlaps(zn1n2, zn1zn2))