Mercurial > octave

diff scripts/optimization/fminsearch.m @ 26138:804e18e3e320

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reenable query of optimization options (bugs #54952 and #55089). * scripts/optimization/__all_opts__.m: Improve documentation of query mechanism. * scripts/optimization/fminbnd.m, scripts/optimization/fminsearch.m, scripts/optimization/fminunc.m, scripts/optimization/fsolve.m, scripts/optimization/fzero.m, scripts/optimization/lsqnonneg.m, scripts/optimization/pqpnonneg.m, default/scripts/optimization/qp.m: Return a struct without double-check by optimset. The sanity of the values is always checked at Octave startup by the PKG_ADD invoked interplay of "__all_opts__" and "optimset".
author Kai T. Ohlhus <k.ohlhus@gmail.com>
date Sun, 25 Nov 2018 15:39:23 +0100
parents 7fa5ee67094a
children da54f14258e1
line wrap: on
line diff
--- a/scripts/optimization/fminsearch.m	Sun Nov 25 21:15:51 2018 -0800
+++ b/scripts/optimization/fminsearch.m	Sun Nov 25 15:39:23 2018 +0100
@@ -128,10 +128,10 @@
 
   ## Get default options if requested.
   if (nargin == 1 && ischar (varargin{1}) && strcmp (varargin{1}, "defaults"))
-    x = optimset ("Display", "notify", "FunValCheck", "off",
-                  "MaxFunEvals", [], "MaxIter", [],
-                  "OutputFcn", [],
-                  "TolFun", 1e-4, "TolX", 1e-4);
+    x = struct ("Display", "notify", "FunValCheck", "off",
+                "MaxFunEvals", [], "MaxIter", [],
+                "OutputFcn", [],
+                "TolFun", 1e-4, "TolX", 1e-4);
     return;
   endif