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

Fix fifth output introduced in e815fb2 (exitflag was not updated).

trustregion
Stéphane Adjemian (Ryûk) 2022-03-03 21:56:44 +01:00
parent afd8359dbf
commit 7072359241
Signed by: stepan
GPG Key ID: 295C1FE89E17EB3C
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
matlab/dynare_solve.m
View File

@ -193,7 +193,7 @@ if options.solve_algo == 0
options4fsolve.Jacobian = 'off';
end
if ~isoctave
[x, ~, exitval] = fsolve(f, x, options4fsolve, arguments{:});
[x, ~, exitflag] = fsolve(f, x, options4fsolve, arguments{:});
else
% Under Octave, use a wrapper, since fsolve() does not have a 4th arg
if ischar(f)
@ -205,15 +205,14 @@ if options.solve_algo == 0
% The Octave version of fsolve does not converge when it starts from the solution
fvec = feval(f, x);
if max(abs(fvec)) >= tolf
[x, ~,exitval] = fsolve(f, x, options4fsolve);
[x, ~, exitflag] = fsolve(f, x, options4fsolve);
else
exitval = 3;
exitflag = 3;
end
end
if exitval == 1
if exitflag == 1
errorflag = false;
elseif exitval > 1
elseif exitflag > 1
if ischar(f)
f2 = str2func(f);
else