Skip to content
Snippets Groups Projects
Commit c3c72192 authored by MichelJuillard's avatar MichelJuillard
Browse files

small bug corrections

parent ef8f3656
No related branches found
No related tags found
No related merge requests found
...@@ -186,3 +186,4 @@ elseif options.solve_algo == 10 ...@@ -186,3 +186,4 @@ elseif options.solve_algo == 10
else else
error('DYNARE_SOLVE: option solve_algo must be one of [0,1,2,3,4,9,10]') error('DYNARE_SOLVE: option solve_algo must be one of [0,1,2,3,4,9,10]')
end end
...@@ -211,7 +211,7 @@ while (t <= sample_size) ...@@ -211,7 +211,7 @@ while (t <= sample_size)
exo_simul,ep.init,initial_conditions,... exo_simul,ep.init,initial_conditions,...
maximum_lag,maximum_lead,steady_state, ... maximum_lag,maximum_lead,steady_state, ...
ep.verbosity,bytecode_flag,ep.stochastic.order,... ep.verbosity,bytecode_flag,ep.stochastic.order,...
M_.params,pfm,ep.stochastic.algo,ep.stock_solve_algo,... M_.params,pfm,ep.stochastic.algo,ep.solve_algo,ep.stack_solve_algo,...
options_.lmmcp,options_,oo_); options_.lmmcp,options_,oo_);
end end
else else
...@@ -227,7 +227,7 @@ while (t <= sample_size) ...@@ -227,7 +227,7 @@ while (t <= sample_size)
exo_simul,ep.init,initial_conditions,... exo_simul,ep.init,initial_conditions,...
maximum_lag,maximum_lead,steady_state, ... maximum_lag,maximum_lead,steady_state, ...
ep.verbosity,bytecode_flag,ep.stochastic.order,... ep.verbosity,bytecode_flag,ep.stochastic.order,...
M_,pfm,ep.stochastic.algo,ep.stack_solve_algo,... M_,pfm,ep.stochastic.algo,ep.solve_algo,ep.stack_solve_algo,...
options_.lmmcp,options_,oo_); options_.lmmcp,options_,oo_);
end end
end end
...@@ -266,7 +266,7 @@ end ...@@ -266,7 +266,7 @@ end
function y = extended_path_core(periods,endo_nbr,exo_nbr,positive_var_indx, ... function y = extended_path_core(periods,endo_nbr,exo_nbr,positive_var_indx, ...
exo_simul,init,initial_conditions,... exo_simul,init,initial_conditions,...
maximum_lag,maximum_lead,steady_state, ... maximum_lag,maximum_lead,steady_state, ...
verbosity,bytecode_flag,order,M,pfm,algo,stack_solve_algo,... verbosity,bytecode_flag,order,M,pfm,algo,solve_algo,stack_solve_algo,...
olmmcp,options,oo) olmmcp,options,oo)
...@@ -297,6 +297,7 @@ if flag ...@@ -297,6 +297,7 @@ if flag
oo.steady_state = steady_state; oo.steady_state = steady_state;
options.bytecode = bytecode_flag; options.bytecode = bytecode_flag;
options.lmmcp = olmmcp; options.lmmcp = olmmcp;
options.solve_algo = solve_algo;
options.stack_solve_algo = stack_solve_algo; options.stack_solve_algo = stack_solve_algo;
[tmp,flag] = perfect_foresight_solver_core(M,options,oo); [tmp,flag] = perfect_foresight_solver_core(M,options,oo);
if ~flag && ~options.no_homotopy if ~flag && ~options.no_homotopy
......
...@@ -46,7 +46,7 @@ for i=1:size(etags,1) ...@@ -46,7 +46,7 @@ for i=1:size(etags,1)
k = find(strcmp(strtrim(str(1:kop-1)),cellstr(M.endo_names))); k = find(strcmp(strtrim(str(1:kop-1)),cellstr(M.endo_names)));
if isempty(k) if isempty(k)
error(sprintf(['Complementarity condition %s: variable %s is ' ... error(sprintf(['Complementarity condition %s: variable %s is ' ...
'not recognized',etags{i,3},b{1}])) 'not recognized',etags{i,3},strtrim(str(1:kop-1))]))
end end
ub(k) = str2num(str(kop+1:end)); ub(k) = str2num(str(kop+1:end));
eq_index(etags{i,1}) = k; eq_index(etags{i,1}) = k;
...@@ -57,7 +57,7 @@ for i=1:size(etags,1) ...@@ -57,7 +57,7 @@ for i=1:size(etags,1)
k = find(strcmp(strtrim(str(1:kop-1)),cellstr(M.endo_names))); k = find(strcmp(strtrim(str(1:kop-1)),cellstr(M.endo_names)));
if isempty(k) if isempty(k)
error(sprintf(['Complementarity condition %s: variable %s is ' ... error(sprintf(['Complementarity condition %s: variable %s is ' ...
'not recognized',etags{i},b{1}])) 'not recognized',etags{i},strtrim(str(1:kop-1))]))
end end
lb(k) = str2num(str(kop+1:end)); lb(k) = str2num(str(kop+1:end));
eq_index(etags{i,1}) = k; eq_index(etags{i,1}) = k;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment