Mercurial > octave
changeset 24546:d3a507ca2d5d
maint: merge stable to default.
author | Rik <rik@octave.org> |
---|---|
date | Sun, 07 Jan 2018 09:57:32 -0800 |
parents | 0c204cd762a4 (current diff) ba8b828ee4f2 (diff) |
children | fdc9ce839afd |
files | doc/interpreter/diffeq.txi doc/interpreter/quad.txi libinterp/corefcn/quad.cc libinterp/corefcn/quadcc.cc scripts/general/dblquad.m scripts/general/quadl.m |
diffstat | 6 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/diffeq.txi Sun Jan 07 07:20:03 2018 -0800 +++ b/doc/interpreter/diffeq.txi Sun Jan 07 09:57:32 2018 -0800 @@ -72,7 +72,7 @@ xdot = zeros (3,1); - xdot(1) = 77.27 * (x(2) - x(1)*x(2) + x(1) \ + xdot(1) = 77.27 * (x(2) - x(1)*x(2) + x(1) ... - 8.375e-06*x(1)^2); xdot(2) = (x(3) - x(1)*x(2) - x(2)) / 77.27; xdot(3) = 0.161*(x(1) - x(3)); @@ -99,7 +99,7 @@ @example @group -t = [0, logspace(-1, log10(303), 150), \ +t = [0, logspace(-1, log10(303), 150), ... logspace(log10(304), log10(500), 150)]; @end group @end example
--- a/doc/interpreter/quad.txi Sun Jan 07 07:20:03 2018 -0800 +++ b/doc/interpreter/quad.txi Sun Jan 07 09:57:32 2018 -0800 @@ -81,7 +81,7 @@ @item @tab quad @tab Low accuracy with nonsmooth integrands @item @tab quadv @tab Medium accuracy with smooth integrands @item @tab quadl @tab Medium accuracy with smooth integrands. Slower than quadgk. -@item @tab quadgk @tab Medium accuracy (@math{1e^{-6}}--@math{1e^{-9}}) with smooth integrands. +@item @tab quadgk @tab Medium accuracy (1e-6 -- 1e-9) with smooth integrands. @item @tab @tab Handles oscillatory functions and infinite bounds @item @tab quadcc @tab Low to High accuracy with nonsmooth/smooth integrands @item @tab @tab Handles oscillatory functions, singularities, and infinite bounds
--- a/libinterp/corefcn/quad.cc Sun Jan 07 07:20:03 2018 -0800 +++ b/libinterp/corefcn/quad.cc Sun Jan 07 09:57:32 2018 -0800 @@ -152,7 +152,7 @@ tolerance. To choose a relative test only, set the absolute tolerance to zero. To choose an absolute test only, set the relative tolerance to zero. Both tolerances default to @code{sqrt (eps)} or -approximately @math{1.5e^{-8}}. +approximately 1.5e-8. The optional argument @var{sing} is a vector of values at which the integrand is known to be singular.
--- a/libinterp/corefcn/quadcc.cc Sun Jan 07 07:20:03 2018 -0800 +++ b/libinterp/corefcn/quadcc.cc Sun Jan 07 09:57:32 2018 -0800 @@ -1513,8 +1513,8 @@ absolute tolerance, and the second element is the desired relative tolerance. To choose a relative test only, set the absolute tolerance to zero. To choose an absolute test only, set the relative tolerance to zero. The default -absolute tolerance is @math{1e^{-10}} (@math{1e^{-5}} for single), and the -default relative tolerance is @math{1e^{-6}} (@math{1e^{-4}} for single). +absolute tolerance is 1e-10 (1e-5 for single), and the default relative +tolerance is 1e-6 (1e-4 for single). The optional argument @var{sing} contains a list of points where the integrand has known singularities, or discontinuities in any of its derivatives, inside
--- a/scripts/general/dblquad.m Sun Jan 07 07:20:03 2018 -0800 +++ b/scripts/general/dblquad.m Sun Jan 07 09:57:32 2018 -0800 @@ -33,7 +33,7 @@ ## whether infinite bounds are accepted. ## ## The optional argument @var{tol} defines the absolute tolerance used to -## integrate each sub-integral. The default value is @math{1e^{-6}}. +## integrate each sub-integral. The default value is 1e-6. ## ## The optional argument @var{quadf} specifies which underlying integrator ## function to use. Any choice but @code{quad} is available and the default
--- a/scripts/general/quadl.m Sun Jan 07 07:20:03 2018 -0800 +++ b/scripts/general/quadl.m Sun Jan 07 09:57:32 2018 -0800 @@ -34,7 +34,7 @@ ## limits must be finite. ## ## The optional argument @var{tol} defines the absolute tolerance with which -## to perform the integration. The default value is @math{1e-6}. +## to perform the integration. The default value is 1e-6. ## ## The algorithm used by @code{quadl} involves recursively subdividing the ## integration interval. If @var{trace} is defined then for each subinterval