Merge branch 'discretionary_bug' of git.dynare.org:JohannesPfeifer/dynare
commit
3aaac2b811
|
@ -34,6 +34,8 @@ persistent Hold
|
||||||
|
|
||||||
info = 0;
|
info = 0;
|
||||||
|
|
||||||
|
dr=oo_.dr; %initialize output argument
|
||||||
|
|
||||||
beta = get_optimal_policy_discount_factor(M_.params, M_.param_names);
|
beta = get_optimal_policy_discount_factor(M_.params, M_.param_names);
|
||||||
|
|
||||||
%call steady_state_file if present to update parameters
|
%call steady_state_file if present to update parameters
|
||||||
|
@ -106,7 +108,6 @@ else
|
||||||
[H,G,info]=discretionary_policy_engine(A.lag,A.contemp,A.lead,B,W,M_.instr_id,beta,options_.dp.maxit,options_.discretionary_tol,options_.qz_criterium);
|
[H,G,info]=discretionary_policy_engine(A.lag,A.contemp,A.lead,B,W,M_.instr_id,beta,options_.dp.maxit,options_.discretionary_tol,options_.qz_criterium);
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
if info
|
if info
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
|
@ -115,7 +116,6 @@ else
|
||||||
end
|
end
|
||||||
|
|
||||||
%write back solution to dr
|
%write back solution to dr
|
||||||
dr=oo_.dr;
|
|
||||||
dr.ys =zeros(M_.endo_nbr,1);
|
dr.ys =zeros(M_.endo_nbr,1);
|
||||||
dr=set_state_space(dr,M_,options_);
|
dr=set_state_space(dr,M_,options_);
|
||||||
T=H(dr.order_var,dr.order_var);
|
T=H(dr.order_var,dr.order_var);
|
||||||
|
|
Loading…
Reference in New Issue