From 1eb7ca4cc698d850ea5cbe5e952b41ab7f7b36ad Mon Sep 17 00:00:00 2001 From: "Steven G. Johnson" Date: Tue, 25 Feb 2014 11:56:41 -0500 Subject: [PATCH] slight clarification of quadgk docs, as discussed in JuliaLang/ODE.jl#13 --- doc/stdlib/base.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/stdlib/base.rst b/doc/stdlib/base.rst index f14d171a3f520..27ca8d67bdc4a 100644 --- a/doc/stdlib/base.rst +++ b/doc/stdlib/base.rst @@ -4362,9 +4362,9 @@ some built-in integration support in Julia. Returns a pair ``(I,E)`` of the estimated integral ``I`` and an estimated upper bound on the absolute error ``E``. If ``maxevals`` - is not exceeded then either ``E <= abstol`` or ``E <= - reltol*norm(I)`` will hold. (Note that it is useful to specify a - positive ``abstol`` in cases where ``norm(I)`` may be zero.) + is not exceeded then ``E <= max(abstol, reltol*norm(I))`` will hold. + (Note that it is useful to specify a positive ``abstol`` in cases where + ``norm(I)`` may be zero.) The endpoints ``a`` etcetera can also be complex (in which case the integral is performed over straight-line segments in the complex