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

solve1: Move condition that could never be reached into if-clause

time-shift
Johannes Pfeifer 2016-03-12 19:43:08 +01:00
parent 1457666221
commit 300ebd02b0
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
matlab/solve1.m
View File

@ -118,7 +118,13 @@ for its = 1:maxit
if check > 0
den = max([f;0.5*nn]) ;
if max(abs(g).*max([abs(x(j2)') ones(1,nn)])')/den < tolmin
return
if max(abs(x(j2)-xold(j2))./max([abs(x(j2)') ones(1,nn)])') < tolx
disp (' ')
disp (['SOLVE: Iteration ' num2str(its)])
disp (['Convergence on dX.'])
disp (x)
return
end
else
disp (' ')
disp (['SOLVE: Iteration ' num2str(its)])
@ -127,13 +133,6 @@ for its = 1:maxit
return
end
if max(abs(x(j2)-xold(j2))./max([abs(x(j2)') ones(1,nn)])') < tolx
disp (' ')
disp (['SOLVE: Iteration ' num2str(its)])
disp (['Convergence on dX.'])
disp (x)
return
end
elseif max(abs(fvec)) < tolf
return
end