Merge remote branch 'origin/master'

This commit is contained in:
Fredrik Johansson 2014-04-15 17:02:14 +02:00
commit bd4696419b
4 changed files with 19 additions and 20 deletions

View file

@ -69,7 +69,10 @@ exclude_patterns = []
# The reST default role (used for this markup: `text`) to use for all documents. # The reST default role (used for this markup: `text`) to use for all documents.
default_role = 'math' default_role = 'math'
latex_preamble = '\usepackage{amsmath,amssymb}\n' latex_preamble = r"""
\usepackage{amsmath,amssymb}
\setcounter{tocdepth}{2}
"""
primary_domain = 'c' primary_domain = 'c'

View file

@ -125,27 +125,27 @@ The program takes the following arguments::
The following functions (specified by an integer code) are implemented: The following functions (specified by an integer code) are implemented:
* 0 - `Z(x)` (Riemann-Siegel Z-function) * 0 - `Z(x)` (Riemann-Siegel Z-function)
* 1 - `\sin(x)` * 1 - `\sin(x)`
* 2 - `\sin(x^2)` * 2 - `\sin(x^2)`
* 3 - `\sin(1/x)` * 3 - `\sin(1/x)`
The following options are available: The following options are available:
* ``-refine d``: If provided, after isolating the roots, attempt to refine * ``-refine d``: If provided, after isolating the roots, attempt to refine
the roots to *d* digits of accuracy using a few bisection steps followed the roots to *d* digits of accuracy using a few bisection steps followed
by Newton's method with adaptive precision, and then print them. by Newton's method with adaptive precision, and then print them.
* ``-verbose``: Print more information. * ``-verbose``: Print more information.
* ``-maxdepth n``: Stop searching after *n* recursive subdivisions. * ``-maxdepth n``: Stop searching after *n* recursive subdivisions.
* ``-maxeval n``: Stop searching after approximately *n* function evaluations * ``-maxeval n``: Stop searching after approximately *n* function evaluations
(the actual number evaluations will be a small multiple of this). (the actual number evaluations will be a small multiple of this).
* ``-maxfound n``: Stop searching after having found *n* isolated roots. * ``-maxfound n``: Stop searching after having found *n* isolated roots.
* ``-prec n``: Working precision to use for the root isolation. * ``-prec n``: Working precision to use for the root isolation.
With *function* 0, the program isolates roots of the Riemann zeta function With *function* 0, the program isolates roots of the Riemann zeta function
on the critical line, and guarantees that no roots are missed on the critical line, and guarantees that no roots are missed

View file

@ -14,9 +14,7 @@ Types, macros and constants
.. type:: fmpcb_calc_func_t .. type:: fmpcb_calc_func_t
Typedef for a pointer to a function with signature Typedef for a pointer to a function with signature::
.. code ::
int func(fmpcb_ptr out, const fmpcb_t inp, void * param, long order, long prec) int func(fmpcb_ptr out, const fmpcb_t inp, void * param, long order, long prec)

View file

@ -28,9 +28,7 @@ Types, macros and constants
.. type:: fmprb_calc_func_t .. type:: fmprb_calc_func_t
Typedef for a pointer to a function with signature Typedef for a pointer to a function with signature::
.. code ::
int func(fmprb_ptr out, const fmprb_t inp, void * param, long order, long prec) int func(fmprb_ptr out, const fmprb_t inp, void * param, long order, long prec)