From 5beea983aad5233b1db905fd4a0ce4e1d3160143 Mon Sep 17 00:00:00 2001
From: Johannes Pfeifer <jpfeifer@gmx.de>
Date: Wed, 14 Nov 2018 16:01:55 +0100
Subject: [PATCH] evaluate_steady_state.m: consistently use params
Prevents erroneously relying on stale parameters from M.params (thanks to Tom Holden); closes #1627
(manually cherry picked from commit c16c2fb894d39b1be4b840172a1fe6064b506395)
---
matlab/evaluate_steady_state.m | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/matlab/evaluate_steady_state.m b/matlab/evaluate_steady_state.m
index d51c08bc8e..98cbf7d84e 100644
--- a/matlab/evaluate_steady_state.m
+++ b/matlab/evaluate_steady_state.m
@@ -49,7 +49,7 @@ exo_ss = [oo.exo_steady_state; oo.exo_det_steady_state];
if length(M.aux_vars) > 0
h_set_auxiliary_variables = str2func([M.fname '_set_auxiliary_variables']);
if ~steadystate_flag
- ys_init = h_set_auxiliary_variables(ys_init,exo_ss,M.params);
+ ys_init = h_set_auxiliary_variables(ys_init,exo_ss,params);
end
end
@@ -290,7 +290,7 @@ if check
info(1)= 20;
%make sure ys contains auxiliary variables in case of problem with dynare_solve
if length(M.aux_vars) > 0 && ~steadystate_flag
- ys = h_set_auxiliary_variables(ys,exo_ss,M.params);
+ ys = h_set_auxiliary_variables(ys,exo_ss,params);
end
resid = evaluate_static_model(ys,exo_ss,params,M,options);
info(2) = resid'*resid ;
@@ -307,15 +307,15 @@ if M.static_and_dynamic_models_differ
z = repmat(ys,1,M.maximum_lead + M.maximum_lag + 1);
zx = repmat([exo_ss'], M.maximum_lead + M.maximum_lag + 1, 1);
if options.bytecode
- [chck, r, junk]= bytecode('dynamic','evaluate', z, zx, M.params, ys, 1);
+ [chck, r, junk]= bytecode('dynamic','evaluate', z, zx, params, ys, 1);
mexErrCheck('bytecode', chck);
elseif options.block
- [r, oo.dr] = feval([M.fname '_dynamic'], z', zx, M.params, ys, M.maximum_lag+1, oo.dr);
+ [r, oo.dr] = feval([M.fname '_dynamic'], z', zx, params, ys, M.maximum_lag+1, oo.dr);
else
iyv = M.lead_lag_incidence';
iyr0 = find(iyv(:));
xys = z(iyr0);
- r = feval([M.fname '_dynamic'], z(iyr0), zx, M.params, ys, M.maximum_lag + 1);
+ r = feval([M.fname '_dynamic'], z(iyr0), zx, params, ys, M.maximum_lag + 1);
end
% Fail if residual greater than tolerance
if max(abs(r)) > options.solve_tolf
--
GitLab