Commit 969fe3c2 authored by Stéphane Adjemian's avatar Stéphane Adjemian
Browse files

Renamed options_.solve_maxit as options_.steady.maxit.

parent bde961fe
...@@ -111,7 +111,7 @@ function [dr,info] = dyn_risky_steadystate_solver(ys0,M, ... ...@@ -111,7 +111,7 @@ function [dr,info] = dyn_risky_steadystate_solver(ys0,M, ...
n = length(x0); n = length(x0);
[x, info] = solve1(@risky_residuals_ds,x0,1:n,1:n,0,1, options.gstep, ... [x, info] = solve1(@risky_residuals_ds,x0,1:n,1:n,0,1, options.gstep, ...
options.solve_tolf,options.solve_tolx, ... options.solve_tolf,options.solve_tolx, ...
options.solve_maxit,options.debug,pm,M,dr, ... options.steady.maxit,options.debug,pm,M,dr, ...
options,oo); options,oo);
if info if info
error('DS approach can''t be computed') error('DS approach can''t be computed')
...@@ -126,7 +126,7 @@ function [dr,info] = dyn_risky_steadystate_solver(ys0,M, ... ...@@ -126,7 +126,7 @@ function [dr,info] = dyn_risky_steadystate_solver(ys0,M, ...
[ys, info] = solve1(func,ys0,1:endo_nbr,1:endo_nbr,0,1, options.gstep, ... [ys, info] = solve1(func,ys0,1:endo_nbr,1:endo_nbr,0,1, options.gstep, ...
options.solve_tolf,options.solve_tolx, ... options.solve_tolf,options.solve_tolx, ...
options.solve_maxit,options.debug,pm,M,dr,options,oo); options.steady.maxit,options.debug,pm,M,dr,options,oo);
% [ys, info] = csolve(func,ys0,[],1e-10,100,M,dr,options,oo); % [ys, info] = csolve(func,ys0,[],1e-10,100,M,dr,options,oo);
if info if info
error('RSS approach can''t be computed') error('RSS approach can''t be computed')
......
...@@ -122,7 +122,7 @@ if options_.solve_algo == 0 ...@@ -122,7 +122,7 @@ if options_.solve_algo == 0
elseif options_.solve_algo == 1 elseif options_.solve_algo == 1
[x,info]=solve1(func,x,1:nn,1:nn,jacobian_flag,1,options_.gstep, ... [x,info]=solve1(func,x,1:nn,1:nn,jacobian_flag,1,options_.gstep, ...
tolf,options_.solve_tolx, ... tolf,options_.solve_tolx, ...
options_.solve_maxit,options_.debug,varargin{:}); options_.steady.maxit,options_.debug,varargin{:});
elseif options_.solve_algo == 2 || options_.solve_algo == 4 elseif options_.solve_algo == 2 || options_.solve_algo == 4
if ~jacobian_flag if ~jacobian_flag
fjac = zeros(nn,nn) ; fjac = zeros(nn,nn) ;
...@@ -150,7 +150,7 @@ elseif options_.solve_algo == 2 || options_.solve_algo == 4 ...@@ -150,7 +150,7 @@ elseif options_.solve_algo == 2 || options_.solve_algo == 4
[x,info]=solve1(func,x,j1(r(i):r(i+1)-1),j2(r(i):r(i+1)-1),jacobian_flag, ... [x,info]=solve1(func,x,j1(r(i):r(i+1)-1),j2(r(i):r(i+1)-1),jacobian_flag, ...
bad_cond_flag, options_.gstep, ... bad_cond_flag, options_.gstep, ...
tolf,options_.solve_tolx, ... tolf,options_.solve_tolx, ...
options_.solve_maxit,options_.debug,varargin{:}); options_.steady.maxit,options_.debug,varargin{:});
if info if info
return return
end end
...@@ -159,7 +159,7 @@ elseif options_.solve_algo == 2 || options_.solve_algo == 4 ...@@ -159,7 +159,7 @@ elseif options_.solve_algo == 2 || options_.solve_algo == 4
if max(abs(fvec)) > tolf if max(abs(fvec)) > tolf
[x,info]=solve1(func,x,1:nn,1:nn,jacobian_flag, bad_cond_flag, ... [x,info]=solve1(func,x,1:nn,1:nn,jacobian_flag, bad_cond_flag, ...
options_.gstep, tolf,options_.solve_tolx, ... options_.gstep, tolf,options_.solve_tolx, ...
options_.solve_maxit,options_.debug,varargin{:}); options_.steady.maxit,options_.debug,varargin{:});
end end
elseif options_.solve_algo == 3 elseif options_.solve_algo == 3
if jacobian_flag if jacobian_flag
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment