small fixes

time-shift
Houtan Bastani 2019-02-25 17:19:40 +01:00
parent 67df1d2df1
commit ce97e51aec
No known key found for this signature in database
GPG Key ID: 000094FB955BE169
2 changed files with 8 additions and 9 deletions

View File

@ -19,7 +19,7 @@ function [ys,params,info] = evaluate_steady_state_file(ys_init,exo_ss,M,options,
% SPECIAL REQUIREMENTS
% none
% Copyright (C) 2001-2018 Dynare Team
% Copyright (C) 2001-2019 Dynare Team
%
% This file is part of Dynare.
%
@ -36,7 +36,6 @@ function [ys,params,info] = evaluate_steady_state_file(ys_init,exo_ss,M,options,
% You should have received a copy of the GNU General Public License
% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
ys = [];
params = M.params;
info = 0;
@ -99,7 +98,7 @@ if updated_params_flag
end
% adding values for auxiliary variables
if length(M.aux_vars) > 0 && ~options.ramsey_policy
if ~isempty(M.aux_vars) && ~options.ramsey_policy
if M.set_auxiliary_variables
ys = h_set_auxiliary_variables(ys,exo_ss,params);
end
@ -129,5 +128,5 @@ elseif ~isempty(options.steadystate_partial)
for i = 1:nov
indv(i) = strmatch(ssvar(i), M.endo_names, 'exact');
end
[ys,check] = dynare_solve('restricted_steadystate', ys(indv), options, exo_ss,indv);
[ys,~] = dynare_solve('restricted_steadystate', ys(indv), options, exo_ss,indv);
end

View File

@ -16,7 +16,7 @@ function oo_=make_y_(M_,options_,oo_)
% none
%
% Copyright (C) 1996-2017 Dynare Team
% Copyright (C) 1996-2019 Dynare Team
%
% This file is part of Dynare.
%
@ -36,7 +36,7 @@ function oo_=make_y_(M_,options_,oo_)
global ys0_
if options_.steadystate_flag
[oo_.steady_state,M_.params,check] = ...
[oo_.steady_state,M_.params,~] = ...
evaluate_steady_state_file(oo_.steady_state,oo_.exo_steady_state,M_, ...
options_,~options_.steadystate.nocheck);
end
@ -47,9 +47,9 @@ end
if isempty(M_.endo_histval)
if isempty(ys0_)
oo_.endo_simul = [oo_.steady_state*ones(1,M_.maximum_lag+options_.periods+M_.maximum_lead)];
oo_.endo_simul = repmat(oo_.steady_state, 1, M_.maximum_lag+options_.periods+M_.maximum_lead);
else
oo_.endo_simul = [ys0_*ones(1,M_.maximum_lag) oo_.steady_state*ones(1,options_.periods+M_.maximum_lead)];
oo_.endo_simul = [repmat(ys0_, 1, M_.maximum_lag) repmat(oo_.steady_state, 1,options_.periods+M_.maximum_lead)];
end
else
if ~isempty(ys0_)
@ -58,5 +58,5 @@ else
% the first NaNs take care of the case where there are lags > 1 on
% exogenous variables
oo_.endo_simul = [M_.endo_histval ...
oo_.steady_state*ones(1,options_.periods+M_.maximum_lead)];
repmat(oo_.steady_state, 1, options_.periods+M_.maximum_lead)];
end