commit before trying to rebase

This commit is contained in:
p15-git-acc 2020-09-27 20:35:14 -05:00
parent 608869d7c9
commit e2ad86f8db
3 changed files with 63 additions and 13 deletions

View file

@ -15,18 +15,29 @@ slong
acb_dirichlet_platt_hardy_z_zeros(
arb_ptr res, const fmpz_t n, slong len, slong prec)
{
slong r, s=0;
if (len <= 0)
{
return 0;
}
else if (fmpz_sgn(n) < 1)
{
flint_printf("nonpositive indices of zeta zeros are not supported\n");
flint_abort();
}
else
{
slong r, s;
fmpz_t k;
fmpz_init(k);
fmpz_set(k, n);
while (len - s)
for (s = 0; len - s > 0; s += r)
{
r = acb_dirichlet_platt_local_hardy_z_zeros(res + s, k, len - s, prec);
flint_printf("r = %ld\n", r);
if (!r)
break;
s += r;
fmpz_add_si(k, k, r);
}
return s;
}
return 0;
}

View file

@ -0,0 +1,39 @@
/*
Copyright (C) 2020 D.H.J. Polymath
This file is part of Arb.
Arb is free software: you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License (LGPL) as published
by the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version. See <http://www.gnu.org/licenses/>.
*/
#include "acb_dirichlet.h"
void
acb_dirichlet_platt_zeta_zeros(acb_ptr res, const fmpz_t n, slong len, slong prec)
{
if (len <= 0)
{
return;
}
else if (fmpz_sgn(n) < 1)
{
flint_printf("nonpositive indices of zeta zeros are not supported\n");
flint_abort();
}
else
{
slong i;
arb_ptr p;
p = _arb_vec_init(len);
acb_dirichlet_platt_hardy_z_zeros(p, n, len, prec);
for (i = 0; i < len; i++)
{
acb_set_d(res + i, 0.5);
arb_set(acb_imagref(res + i), p + i);
}
_arb_vec_clear(p, len);
}
}

View file

@ -21,7 +21,7 @@ acb_dirichlet_zeta_zeros(acb_ptr res, const fmpz_t n, slong len, slong prec)
}
else if (fmpz_sgn(n) < 1)
{
flint_printf("nonpositive indices of zeros are not supported\n");
flint_printf("nonpositive indices of zeta zeros are not supported\n");
flint_abort();
}
else