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

Merge branch 'planner_matlab_2014' into 'master'

evaluate_planner_objective.m: compatibility fix for older Matlab versions

See merge request Dynare/dynare!1924
parents 4346903c 85a5a563
Branches
No related tags found
No related merge requests found
...@@ -95,9 +95,9 @@ if options_.ramsey_policy ...@@ -95,9 +95,9 @@ if options_.ramsey_policy
[U] = feval([M_.fname '.objective.static'],oo_.endo_simul(:,t),oo_.exo_simul(t,:), M_.params); [U] = feval([M_.fname '.objective.static'],oo_.endo_simul(:,t),oo_.exo_simul(t,:), M_.params);
W = U + beta*W; W = U + beta*W;
end end
planner_objective_value = struct("conditional", W, "unconditional", EW); planner_objective_value = struct('conditional', W, 'unconditional', EW);
else else
planner_objective_value = struct("conditional", struct("zero_initial_multiplier", 0., "steady_initial_multiplier", 0.), "unconditional", 0.); planner_objective_value = struct('conditional', struct('zero_initial_multiplier', 0., 'steady_initial_multiplier', 0.), 'unconditional', 0.);
ys = oo_.dr.ys; ys = oo_.dr.ys;
if options_.order == 1 || M_.hessian_eq_zero if options_.order == 1 || M_.hessian_eq_zero
[U,Uy] = feval([M_.fname '.objective.static'],ys,zeros(1,exo_nbr), M_.params); [U,Uy] = feval([M_.fname '.objective.static'],ys,zeros(1,exo_nbr), M_.params);
...@@ -228,7 +228,7 @@ if options_.ramsey_policy ...@@ -228,7 +228,7 @@ if options_.ramsey_policy
end end
elseif options_.discretionary_policy elseif options_.discretionary_policy
ys = oo_.dr.ys; ys = oo_.dr.ys;
planner_objective_value = struct("conditional", struct("zero_initial_multiplier", 0., "steady_initial_multiplier", 0.), "unconditional", 0.); planner_objective_value = struct('conditional', struct('zero_initial_multiplier', 0., 'steady_initial_multiplier', 0.), 'unconditional', 0.);
[U,Uy,Uyy] = feval([M_.fname '.objective.static'],ys,zeros(1,exo_nbr), M_.params); [U,Uy,Uyy] = feval([M_.fname '.objective.static'],ys,zeros(1,exo_nbr), M_.params);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment