Merge branch 'planner_objective_linear' into 'master'

evaluate_planner_objective.m: do not evaluate non-existing terms for linear models

Closes #1781

See merge request Dynare/dynare!1864
time-shift
Sébastien Villemot 2021-05-31 13:30:18 +00:00
commit 95486a9ac0
1 changed files with 2 additions and 2 deletions

View File

@ -98,11 +98,11 @@ if options_.ramsey_policy
planner_objective_value(2) = W;
else
ys = oo_.dr.ys;
if options_.order == 1
if options_.order == 1 || M_.hessian_eq_zero
[U] = feval([M_.fname '.objective.static'],ys,zeros(1,exo_nbr), M_.params);
planner_objective_value(1) = U/(1-beta);
planner_objective_value(2) = U/(1-beta);
elseif options_.order == 2
elseif options_.order == 2 && ~M_.hessian_eq_zero
[U,Uy,Uyy] = feval([M_.fname '.objective.static'],ys,zeros(1,exo_nbr), M_.params);
Gy = dr.ghx(nstatic+(1:nspred),:);