mirror of
https://github.com/vale981/arb
synced 2025-03-05 09:21:38 -05:00
better algorithm for multi-evaluation of odd zetas
This commit is contained in:
parent
6be68c2b0a
commit
eda22bb13f
6 changed files with 222 additions and 20 deletions
14
fmpr.h
14
fmpr.h
|
@ -376,6 +376,20 @@ _fmpz_size(const fmpz_t f)
|
|||
return mpz_size(COEFF_TO_PTR(d));
|
||||
}
|
||||
|
||||
static __inline__ void
|
||||
fmpz_ui_pow_ui(fmpz_t x, ulong b, ulong e)
|
||||
{
|
||||
if (e <= 1)
|
||||
{
|
||||
fmpz_set_ui(x, e == 0 ? 1UL : b);
|
||||
}
|
||||
else
|
||||
{
|
||||
fmpz_set_ui(x, b);
|
||||
fmpz_pow_ui(x, x, e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Arithmetic */
|
||||
|
||||
|
|
3
fmprb.h
3
fmprb.h
|
@ -179,6 +179,8 @@ void fmprb_div_fmpz(fmprb_t z, const fmprb_t x, const fmpz_t y, long prec);
|
|||
void fmprb_fmpz_div_fmpz(fmprb_t y, const fmpz_t num, const fmpz_t den, long prec);
|
||||
void fmprb_ui_div(fmprb_t z, ulong x, const fmprb_t y, long prec);
|
||||
|
||||
void fmprb_div_2expm1_ui(fmprb_t y, const fmprb_t x, ulong n, long prec);
|
||||
|
||||
void fmprb_mul(fmprb_t z, const fmprb_t x, const fmprb_t y, long prec);
|
||||
void fmprb_mul_ui(fmprb_t z, const fmprb_t x, ulong y, long prec);
|
||||
void fmprb_mul_si(fmprb_t z, const fmprb_t x, long y, long prec);
|
||||
|
@ -225,6 +227,7 @@ void fmprb_const_zeta3_bsplit(fmprb_t x, long prec);
|
|||
void fmprb_zeta_ui_bsplit(fmprb_t x, ulong s, long prec);
|
||||
void fmprb_zeta_ui_euler_product(fmprb_t z, ulong s, long prec);
|
||||
void fmprb_zeta_ui_bernoulli(fmprb_t x, ulong n, long prec);
|
||||
void fmprb_zeta_ui_vec_borwein(fmprb_struct * z, ulong start, long num, ulong step, long prec);
|
||||
void fmprb_zeta_ui(fmprb_t x, ulong n, long prec);
|
||||
|
||||
static __inline__ void
|
||||
|
|
51
fmprb/div_2expm1.c
Normal file
51
fmprb/div_2expm1.c
Normal file
|
@ -0,0 +1,51 @@
|
|||
/*=============================================================================
|
||||
|
||||
This file is part of ARB.
|
||||
|
||||
ARB is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
ARB is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with ARB; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
=============================================================================*/
|
||||
/******************************************************************************
|
||||
|
||||
Copyright (C) 2012 Fredrik Johansson
|
||||
|
||||
******************************************************************************/
|
||||
|
||||
#include "fmprb.h"
|
||||
|
||||
/* sets y = x / (2^n - 1) */
|
||||
/* XXX: for huge n, use better algorithm / fix overflow in the loop */
|
||||
void
|
||||
fmprb_div_2expm1_ui(fmprb_t y, const fmprb_t x, ulong n, long prec)
|
||||
{
|
||||
fmpz_t t;
|
||||
fmprb_t u;
|
||||
long i;
|
||||
|
||||
fmpz_init(t);
|
||||
fmprb_init(u);
|
||||
|
||||
for (i = prec; i >= 0; i -= n)
|
||||
fmpz_setbit(t, i);
|
||||
|
||||
fmpr_set_fmpz(fmprb_midref(u), t);
|
||||
fmpr_one(fmprb_radref(u));
|
||||
|
||||
fmprb_mul(y, x, u, prec);
|
||||
fmprb_mul_2exp_si(y, y, -prec-n);
|
||||
|
||||
fmpz_clear(t);
|
||||
fmprb_clear(u);
|
||||
}
|
|
@ -27,25 +27,23 @@
|
|||
#include "arith.h"
|
||||
#include "fmprb.h"
|
||||
|
||||
static void
|
||||
fmprb_zeta_ui_mpfr(fmprb_t x, ulong n, long prec)
|
||||
{
|
||||
mpfr_t t;
|
||||
mpfr_init2(t, prec);
|
||||
mpfr_zeta_ui(t, n, MPFR_RNDD);
|
||||
fmprb_zero(x);
|
||||
fmpr_set_mpfr(fmprb_midref(x), t);
|
||||
fmprb_add_error_2exp_si(x, mpfr_get_exp(t)-prec);
|
||||
mpfr_clear(t);
|
||||
}
|
||||
|
||||
void
|
||||
fmprb_zeta_ui(fmprb_t x, ulong n, long prec)
|
||||
{
|
||||
/* asymptotic case */
|
||||
if (n == 0 || n > 0.7 * prec)
|
||||
if (n == 0)
|
||||
{
|
||||
fmprb_zeta_ui_mpfr(x, n, prec);
|
||||
fmprb_set_si(x, -1);
|
||||
fmprb_mul_2exp_si(x, x, -1);
|
||||
}
|
||||
else if (n == 1)
|
||||
{
|
||||
printf("exception: zeta_ui(1)\n");
|
||||
abort();
|
||||
}
|
||||
/* asymptotic case */
|
||||
else if (n > 6 && n > 0.7 * prec)
|
||||
{
|
||||
fmprb_zeta_ui_euler_product(x, n, prec);
|
||||
}
|
||||
else if (n == 3)
|
||||
{
|
||||
|
@ -69,6 +67,6 @@ fmprb_zeta_ui(fmprb_t x, ulong n, long prec)
|
|||
/* fallback */
|
||||
else
|
||||
{
|
||||
fmprb_zeta_ui_mpfr(x, n, prec);
|
||||
fmprb_zeta_ui_vec_borwein(x, n, 1, 0, prec);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -210,7 +210,10 @@ fmprb_zeta_ui_bsplit(fmprb_t x, ulong s, long prec)
|
|||
fmprb_mul(sum->Q2, sum->Q2, sum->C, wp);
|
||||
fmprb_div(sum->C, sum->E, sum->Q2, wp);
|
||||
|
||||
/* D = 1/(1 - 2^(1-s)) */
|
||||
/* The error for eta(s) is bounded by 3/(3+sqrt(8))^n */
|
||||
fmprb_add_error_2exp_si(sum->C, (long) (ERROR_A - ERROR_B * n + 1));
|
||||
|
||||
/* To get zeta(s), multiply by D = 1/(1 - 2^(1-s)) */
|
||||
{
|
||||
fmpz_t t;
|
||||
fmpz_init(t);
|
||||
|
@ -228,8 +231,5 @@ fmprb_zeta_ui_bsplit(fmprb_t x, ulong s, long prec)
|
|||
|
||||
fmprb_mul(x, sum->C, sum->D, wp);
|
||||
|
||||
/* The truncation error is bounded by 3/(3+sqrt(8))^n */
|
||||
fmprb_add_error_2exp_si(x, (long) (ERROR_A - ERROR_B * n + 1));
|
||||
|
||||
zeta_bsplit_clear(sum);
|
||||
}
|
||||
|
|
136
fmprb/zeta_ui_vec_borwein.c
Normal file
136
fmprb/zeta_ui_vec_borwein.c
Normal file
|
@ -0,0 +1,136 @@
|
|||
/*=============================================================================
|
||||
|
||||
This file is part of ARB.
|
||||
|
||||
ARB is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
ARB is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with ARB; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
=============================================================================*/
|
||||
/******************************************************************************
|
||||
|
||||
Copyright (C) 2012 Fredrik Johansson
|
||||
|
||||
******************************************************************************/
|
||||
|
||||
#include "fmprb.h"
|
||||
|
||||
/* With parameter n, the error is bounded by 3/(3+sqrt(8))^n */
|
||||
#define ERROR_A 1.5849625007211561815 /* log2(3) */
|
||||
#define ERROR_B 2.5431066063272239453 /* log2(3+sqrt(8)) */
|
||||
|
||||
/*
|
||||
Computes zeta(s) for s = start + i*step, 0 <= i < num, writing the
|
||||
consecutive values to the array z. Uses Borwein's algorithm, here
|
||||
extended to support fast multi-evaluation (but also works well
|
||||
for a single s).
|
||||
|
||||
Requires start >= 2. For efficiency, the largest s should be at most about as
|
||||
large as prec. Arguments approaching LONG_MAX will cause overflows.
|
||||
One should therefore only use this function for s up to about prec, and
|
||||
then switch to the Euler product.
|
||||
|
||||
References:
|
||||
|
||||
P. Borwein, "An Efficient Algorithm for the Riemann Zeta Function",
|
||||
Constructive experimental and nonlinear analysis,
|
||||
CMS Conference Proc. 27 (2000), 29–34
|
||||
http://www.cecm.sfu.ca/personal/pborwein/PAPERS/P155.pdf
|
||||
|
||||
The MPFR team (2012), "MPFR Algorithms", http://www.mpfr.org/algo.html
|
||||
|
||||
X. Gourdon and P. Sebah (2003),
|
||||
"Numerical evaluation of the Riemann Zeta-function"
|
||||
http://numbers.computation.free.fr/Constants/Miscellaneous/zetaevaluations.pdf
|
||||
|
||||
The algorithm for single s is basically identical to the one used in MPFR
|
||||
(see the MPFR Algorithms paper for a detailed description).
|
||||
In particular, we evaluate the sum backwards to avoid temporary storage of
|
||||
the d_k coefficients, and use integer arithmetic throughout since it
|
||||
is convenient and the terms turn out to be slightly larger than 2^prec.
|
||||
The only numerical error in the main loop comes from the division by k^s,
|
||||
which adds less than 1 unit of error per term.
|
||||
For fast multi-evaluation, we perform repeated divisions by k^step.
|
||||
Each division decreases the input error and adds at most 1 unit of rounding
|
||||
error, so by induction, the error per term is always smaller than 2 units.
|
||||
|
||||
*/
|
||||
|
||||
void
|
||||
fmprb_zeta_ui_vec_borwein(fmprb_struct * z, ulong start, long num,
|
||||
ulong step, long prec)
|
||||
{
|
||||
long j, k, s, n, wp;
|
||||
fmpz_t c, d, t, u;
|
||||
fmpz * zeta;
|
||||
|
||||
wp = prec + FLINT_BIT_COUNT(prec);
|
||||
n = wp / 2.5431066063272239453 + 1;
|
||||
|
||||
fmpz_init(c);
|
||||
fmpz_init(d);
|
||||
fmpz_init(t);
|
||||
fmpz_init(u);
|
||||
zeta = _fmpz_vec_init(num);
|
||||
|
||||
fmpz_set_ui(c, 1);
|
||||
fmpz_mul_2exp(c, c, 2 * n - 1);
|
||||
fmpz_set(d, c);
|
||||
|
||||
for (k = n; k > 0; k--)
|
||||
{
|
||||
/* divide by first k^s */
|
||||
fmpz_ui_pow_ui(u, k, start);
|
||||
fmpz_tdiv_q(t, d, u);
|
||||
if (k % 2 == 0)
|
||||
fmpz_neg(t, t);
|
||||
fmpz_add(zeta, zeta, t);
|
||||
|
||||
/* remaining k^s */
|
||||
fmpz_ui_pow_ui(u, k, step);
|
||||
for (j = 1; j < num; j++)
|
||||
{
|
||||
fmpz_tdiv_q(t, t, u);
|
||||
fmpz_add(zeta + j, zeta + j, t);
|
||||
}
|
||||
|
||||
/* hypergeometric recurrence */
|
||||
fmpz_mul2_uiui(c, c, k, 2 * k - 1);
|
||||
fmpz_divexact2_uiui(c, c, 2 * (n - k + 1), n + k - 1);
|
||||
fmpz_add(d, d, c);
|
||||
}
|
||||
|
||||
for (k = 0; k < num; k++)
|
||||
{
|
||||
fmprb_struct * x = z + k;
|
||||
s = start + step * k;
|
||||
|
||||
fmprb_set_fmpz(x, zeta + k);
|
||||
/* the error in each term in the main loop is < 2 */
|
||||
fmpr_set_ui(fmprb_radref(x), 2 * n);
|
||||
fmprb_div_fmpz(x, x, d, wp);
|
||||
|
||||
/* mathematical error for eta(s), bounded by 3/(3+sqrt(8))^n */
|
||||
fmprb_add_error_2exp_si(x, (long) (ERROR_A - ERROR_B * n + 1));
|
||||
|
||||
/* convert from eta(s) to zeta(s) */
|
||||
fmprb_div_2expm1_ui(x, x, s - 1, wp);
|
||||
fmprb_mul_2exp_si(x, x, s - 1);
|
||||
}
|
||||
|
||||
fmpz_clear(c);
|
||||
fmpz_clear(d);
|
||||
fmpz_clear(t);
|
||||
fmpz_clear(u);
|
||||
_fmpz_vec_clear(zeta, num);
|
||||
}
|
Loading…
Add table
Reference in a new issue