Partially reverts 1190cab
.
parent
1190caba61
commit
4d69674874
|
@ -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.
|
||||||
|
|
Loading…
Reference in New Issue