From d1120da658a35e965e22fdd85b9c55db8288c703 Mon Sep 17 00:00:00 2001 From: Michel Juillard Date: Sat, 21 Apr 2012 11:39:21 +0200 Subject: [PATCH] fixing bugs in evaluation of steady state file introduced in last related commit --- matlab/evaluate_steady_state.m | 18 +++++------------- matlab/evaluate_steady_state_file.m | 1 + 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/matlab/evaluate_steady_state.m b/matlab/evaluate_steady_state.m index 919fac81e..3e73c3c57 100644 --- a/matlab/evaluate_steady_state.m +++ b/matlab/evaluate_steady_state.m @@ -55,7 +55,11 @@ function [ys,params,info] = evaluate_steady_state(ys_init,M,options,oo,steadysta [ys,params] = dyn_ramsey_static(ys_init,M,options,oo); elseif steadystate_flag % explicit steady state file - [ys,params1,check] = evaluate_steady_state_file(ys_init,exo_ss,M,options); + [ys,params1,info] = evaluate_steady_state_file(ys_init,exo_ss,M, ... + options); + if info(1) + return; + end elseif (options.bytecode == 0 && options.block == 0) if options.linear == 0 % non linear model @@ -105,15 +109,3 @@ function [ys,params,info] = evaluate_steady_state(ys_init,M,options,oo,steadysta return end - if options.steadystate_flag && updated_params_flag && ~isreal(params) - info(1) = 23; - info(2) = sum(imag(params).^2); - return - end - - if options.steadystate_flag && updated_params_flag && ~isempty(find(isnan(params))) - info(1) = 24; - info(2) = NaN; - return - end - diff --git a/matlab/evaluate_steady_state_file.m b/matlab/evaluate_steady_state_file.m index cf6719972..f300f5f83 100644 --- a/matlab/evaluate_steady_state_file.m +++ b/matlab/evaluate_steady_state_file.m @@ -79,6 +79,7 @@ function [ys,params,info] = evaluate_steady_state_file(ys_init,exo_ss,M,options) % adding values for auxiliary variables if length(M.aux_vars) > 0 + h_set_auxiliary_variables = str2func([M.fname '_set_auxiliary_variables']); ys = h_set_auxiliary_variables(ys,exo_ss,params); end