some more utility functions; cached const_pi

This commit is contained in:
Fredrik Johansson 2012-09-03 16:26:41 +02:00
parent 6dd11555cc
commit d780701d0c
5 changed files with 130 additions and 20 deletions

17
fmpr.h
View file

@ -734,5 +734,22 @@ fmpr_printd(const fmpr_t x, long digits)
mpfr_clear(t);
}
static __inline__ void
fmpr_mul_2exp_si(fmpr_t y, const fmpr_t x, long e)
{
if (e == 0 || fmpr_is_special(x))
{
fmpr_set(y, x);
}
else
{
fmpz_set(fmpr_manref(y), fmpr_manref(x));
if (e > 0)
fmpz_add_ui(fmpr_expref(y), fmpr_expref(x), e);
else
fmpz_sub_ui(fmpr_expref(y), fmpr_expref(x), -e);
}
}
#endif

17
fmprb.h
View file

@ -137,6 +137,7 @@ void fmprb_div(fmprb_t z, const fmprb_t x, const fmprb_t y, long prec);
void fmprb_div_ui(fmprb_t z, const fmprb_t x, ulong y, long prec);
void fmprb_div_si(fmprb_t z, const fmprb_t x, long y, long prec);
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_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);
@ -157,6 +158,7 @@ void fmprb_submul_ui(fmprb_t z, const fmprb_t x, ulong y, long prec);
void fmprb_submul_si(fmprb_t z, const fmprb_t x, long y, long prec);
void fmprb_submul_fmpz(fmprb_t z, const fmprb_t x, const fmpz_t y, long prec);
void fmprb_pow_ui(fmprb_t y, const fmprb_t b, ulong e, long prec);
void fmprb_ui_pow_ui(fmprb_t y, ulong b, ulong e, long prec);
void fmprb_si_pow_ui(fmprb_t y, long b, ulong e, long prec);
@ -170,6 +172,8 @@ void fmprb_bin_ui(fmprb_t x, const fmprb_t n, ulong k, long prec);
void fmprb_bin_uiui(fmprb_t x, ulong n, ulong k, long prec);
void fmprb_const_pi_chudnovsky(fmprb_t x, long prec);
void fmprb_const_pi(fmprb_t x, long prec);
void fmprb_const_euler_brent_mcmillan(fmprb_t res, long prec);
void fmprb_const_zeta3_bsplit(fmprb_t x, long prec);
@ -195,5 +199,18 @@ fmprb_printd(const fmprb_t x, long digits)
fmpr_printd(fmprb_radref(x), 5);
}
static __inline__ void
fmprb_mul_2exp_si(fmprb_t y, const fmprb_t x, long e)
{
fmpr_mul_2exp_si(fmprb_midref(y), fmprb_midref(x), e);
fmpr_mul_2exp_si(fmprb_radref(y), fmprb_radref(x), e);
}
static __inline__ void
fmprb_set_fmpq(fmprb_t y, const fmpq_t x, long prec)
{
fmprb_fmpz_div_fmpz(y, fmpq_numref(x), fmpq_denref(x), prec);
}
#endif

46
fmprb/const_pi.c Normal file
View file

@ -0,0 +1,46 @@
/*=============================================================================
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"
/* TODO: make threadsafe; round output */
long fmprb_const_pi_cached_prec = 0;
fmprb_t fmprb_const_pi_cache;
void
fmprb_const_pi(fmprb_t x, long prec)
{
if (fmprb_const_pi_cached_prec < prec)
{
if (fmprb_const_pi_cached_prec == 0)
fmprb_init(fmprb_const_pi_cache);
fmprb_const_pi_chudnovsky(fmprb_const_pi_cache, prec);
fmprb_const_pi_cached_prec = prec;
}
fmprb_set(x, fmprb_const_pi_cache);
}

View file

@ -118,3 +118,22 @@ fmprb_div_fmpz(fmprb_t z, const fmprb_t x, const fmpz_t y, long prec)
fmprb_div(z, x, t, prec);
fmprb_clear(t);
}
void
fmprb_fmpz_div_fmpz(fmprb_t y, const fmpz_t num, const fmpz_t den, long prec)
{
fmpr_t p, q;
long r;
fmpr_init(p);
fmpr_init(q);
fmpr_set_fmpz(p, num);
fmpr_set_fmpz(q, den);
r = fmpr_div(fmprb_midref(y), p, q, prec, FMPR_RND_DOWN);
fmpr_set_error_result(fmprb_radref(y), fmprb_midref(y), r);
fmpr_clear(p);
fmpr_clear(q);
}

View file

@ -26,41 +26,52 @@
#include "fmprb.h"
void
fmprb_ui_pow_ui(fmprb_t y, ulong b, ulong e, long prec)
fmprb_pow_ui(fmprb_t y, const fmprb_t b, ulong e, long prec)
{
long i;
if (e <= 1)
if (y == b)
{
fmprb_set_ui(y, e == 0 ? 1 : b);
fmprb_t t;
fmprb_init(t);
fmprb_set(t, b);
fmprb_pow_ui(y, t, e, prec);
fmprb_clear(t);
return;
}
fmprb_set_ui(y, b);
if (e == 0)
{
fmprb_set_ui(y, 1UL);
return;
}
fmprb_set(y, b);
for (i = FLINT_BIT_COUNT(e) - 2; i >= 0; i--)
{
fmprb_mul(y, y, y, prec);
if (e & (1UL<<i))
fmprb_mul_ui(y, y, b, prec);
fmprb_mul(y, y, b, prec);
}
}
void
fmprb_ui_pow_ui(fmprb_t y, ulong b, ulong e, long prec)
{
fmprb_t t;
fmprb_init(t);
fmprb_set_ui(t, b);
fmprb_pow_ui(y, t, e, prec);
fmprb_clear(t);
}
void
fmprb_si_pow_ui(fmprb_t y, long b, ulong e, long prec)
{
long i;
if (e <= 1)
{
fmprb_set_si(y, e == 0 ? 1 : b);
return;
}
fmprb_set_si(y, b);
for (i = FLINT_BIT_COUNT(e) - 2; i >= 0; i--)
{
fmprb_mul(y, y, y, prec);
if (e & (1UL<<i))
fmprb_mul_si(y, y, b, prec);
}
fmprb_t t;
fmprb_init(t);
fmprb_set_si(t, b);
fmprb_pow_ui(y, t, e, prec);
fmprb_clear(t);
}