Skip to content
Snippets Groups Projects
Commit 95486a9a authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

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 !1864
parents 27ee801a fad86785
No related branches found
No related tags found
1 merge request!1864evaluate_planner_objective.m: do not evaluate non-existing terms for linear models
Pipeline #5418 passed
......@@ -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),:);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment