stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partially reverts 1190cab.

time-shift
Stéphane Adjemian (Charybdis) 2019-03-07 12:31:23 +01:00
parent 1190caba61
commit 4d69674874
Signed by untrusted user who does not match committer: stepan
GPG Key ID: A6D44CB9C64CE77B
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
matlab/+pac/+estimate/nls.m
View File

@ -280,23 +280,23 @@ if nargin<5
end end
if is_gauss_newton if is_gauss_newton
[params1, SSR] = gauss_newton(resfun, params0); [params1, SSR, exitflag] = gauss_newton(resfun, params0);
elseif is_lsqnonlin elseif is_lsqnonlin
if ismember('levenberg-marquardt', varargin) if ismember('levenberg-marquardt', varargin)
% Levenberg Marquardt does not handle boundary constraints. % Levenberg Marquardt does not handle boundary constraints.
[params1, SSR] = lsqnonlin(resfun, params0, [], [], optimset(varargin{:})); [params1, SSR, ~, exitflag] = lsqnonlin(resfun, params0, [], [], optimset(varargin{:}));
else else
[params1, SSR] = lsqnonlin(resfun, params0, bounds(:,1), bounds(:,2), optimset(varargin{:})); [params1, SSR, ~, exitflag] = lsqnonlin(resfun, params0, bounds(:,1), bounds(:,2), optimset(varargin{:}));
end end
else else
% Estimate the parameters by minimizing the sum of squared residuals. % Estimate the parameters by minimizing the sum of squared residuals.
[params1, SSR] = dynare_minimize_objective(ssrfun, params0, ... [params1, SSR, exitflag] = dynare_minimize_objective(ssrfun, params0, ...
minalgo, ... minalgo, ...
options_, ... options_, ...
bounds, ... bounds, ...
parameter_names, ... parameter_names, ...
[], ... [], ...
[]); []);
end end
% Revert local modifications to the options. % Revert local modifications to the options.