# HG changeset patch # User Jaroslav Hajek # Date 1267770566 -3600 # Node ID 7df8f8194c9650df9f283d756dde975ec2a31e8b # Parent b4e5dcf023c9bbe154e29624a84fbdea1c94427b fix tests in fminbnd diff --git a/scripts/ChangeLog b/scripts/ChangeLog --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2010-03-04 Jaroslav Hajek + + * optimization/fminbnd.m: Fix tests. + 2010-03-04 Jaroslav Hajek * optimization/fminbnd.m: Fix termination tolerances. diff --git a/scripts/optimization/fminbnd.m b/scripts/optimization/fminbnd.m --- a/scripts/optimization/fminbnd.m +++ b/scripts/optimization/fminbnd.m @@ -204,7 +204,7 @@ %!shared opt0 %! opt0 = optimset ("tolx", 0); -%!assert (fminbnd (@cos, pi/2, 3*pi/2, opt0), pi, 10*eps) -%!assert (fminbnd (@(x) (x - 1e-3)^4, -1, 1, opt0), 1e-3, 10e-3*eps) -%!assert (fminbnd (@(x) abs(x-1e7), 0, 1e10, opt0), 1e7, 10e7*eps) -%!assert (fminbnd (@(x) x^2 + sin(2*pi*x), 0.4, 1, opt0), fzero (@(x) 2*x + 2*pi*cos(2*pi*x), [0.4, 1], opt0), 1e-7) +%!assert (fminbnd (@cos, pi/2, 3*pi/2, opt0), pi, 10*sqrt(eps)) +%!assert (fminbnd (@(x) (x - 1e-3)^4, -1, 1, opt0), 1e-3, 10e-3*sqrt(eps)) +%!assert (fminbnd (@(x) abs(x-1e7), 0, 1e10, opt0), 1e7, 10e7*sqrt(eps)) +%!assert (fminbnd (@(x) x^2 + sin(2*pi*x), 0.4, 1, opt0), fzero (@(x) 2*x + 2*pi*cos(2*pi*x), [0.4, 1], opt0), sqrt(eps))