From c9534f98d8802bdbad7f85e8351d3aa4912a5941 Mon Sep 17 00:00:00 2001 From: michel Date: Mon, 31 Jul 2006 17:17:05 +0000 Subject: [PATCH] v3+4 solve1.m: bug correction git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@852 ac1d8469-bf42-47a9-8791-bf33cf982152 --- matlab/solve1.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/matlab/solve1.m b/matlab/solve1.m index 889125889..77c230ac9 100644 --- a/matlab/solve1.m +++ b/matlab/solve1.m @@ -99,7 +99,7 @@ function [x,check] = solve1(func,x,j1,j2,jacobian_flag,varargin) if check > 0 den = max([f;0.5*nn]) ; - if max(abs(g).*max([abs(x');ones(1,nn)])')/den < tolmin + if max(abs(g).*max([abs(x(j2)') ones(1,nn)])')/den < tolmin return else disp (' ') @@ -109,7 +109,7 @@ function [x,check] = solve1(func,x,j1,j2,jacobian_flag,varargin) return end - if max(abs(x-xold)./max([abs(x);ones(1,nn)])') < tolx + 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.'])