From 436e414427f4106769c8b6248ec59b4310a0d167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=28Charybdis=29?= Date: Thu, 1 Mar 2018 10:13:44 +0100 Subject: [PATCH] Cosmetic change. Changed M_.max_*_orig into M_.orig_maximum_* for consistency with other fields. (cherry picked from commit 857a3842e3b6035a0e5bf0b160ed8264821b16f7) --- matlab/backward/backward_model_inversion.m | 2 +- matlab/backward/simul_backward_linear_model_.m | 4 ++-- matlab/backward/simul_backward_model_init.m | 8 ++++---- matlab/set_historical_values.m | 2 +- preprocessor | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/matlab/backward/backward_model_inversion.m b/matlab/backward/backward_model_inversion.m index 1af466be8..d9ed0d0ae 100644 --- a/matlab/backward/backward_model_inversion.m +++ b/matlab/backward/backward_model_inversion.m @@ -94,7 +94,7 @@ for i=1:nyctrl end % Exogenous variables. -X = exogenousvariables.data; %{exo_names{:}}(constraints.dates(1)-max(1,DynareModel.max_exo_lag_orig):constraints.dates(end)).data; +X = exogenousvariables.data; %{exo_names{:}}(constraints.dates(1)-max(1,DynareModel.orig_maximum_exo_lag):constraints.dates(end)).data; % Inversion of the model, solvers for the free endogenous and exogenous variables (call a Newton-like algorithm in each period). diff --git a/matlab/backward/simul_backward_linear_model_.m b/matlab/backward/simul_backward_linear_model_.m index d22db5228..f57585e0d 100644 --- a/matlab/backward/simul_backward_linear_model_.m +++ b/matlab/backward/simul_backward_linear_model_.m @@ -44,9 +44,9 @@ end % Get coefficients [cst, jacob] = model_dynamic(zeros(DynareModel.endo_nbr+ny1,1), ... - zeros(DynareModel.max_lag_orig+1,DynareModel.exo_nbr), ... + zeros(DynareModel.orig_maximum_lag+1,DynareModel.exo_nbr), ... DynareModel.params, ... - DynareOutput.steady_state, DynareModel.max_lag_orig+1); + DynareOutput.steady_state, DynareModel.orig_maximum_lag+1); A0inv = inv(jacob(:,jdx)); A1 = jacob(:,nonzeros(DynareModel.lead_lag_incidence(1,:))); diff --git a/matlab/backward/simul_backward_model_init.m b/matlab/backward/simul_backward_model_init.m index 4afc61ac1..7a12328e3 100644 --- a/matlab/backward/simul_backward_model_init.m +++ b/matlab/backward/simul_backward_model_init.m @@ -37,10 +37,10 @@ end % If initialconditions is empty instantiates a dseries object with the informations available in DynareModel.endo_histval. if isempty(initialconditions) - yinitdata = zeros(DynareModel.orig_endo_nbr, DynareModel.max_lag_orig); + yinitdata = zeros(DynareModel.orig_endo_nbr, DynareModel.orig_maximum_lag); yinitdata(:,1) = DynareModel.endo_histval(1:DynareModel.orig_endo_nbr); - xinitdata = zeros(DynareModel.exo_nbr, DynareModel.max_lag_orig); - if DynareModel.max_endo_lag_orig>1 + xinitdata = zeros(DynareModel.exo_nbr, DynareModel.orig_maximum_lag); + if DynareModel.orig_maximum_endo_lag>1 for i = 1:length(DynareModel.aux_vars) if DynareModel.aux_vars(i).type==1 yinitdata(DynareModel.aux_vars(i).orig_index, abs(DynareModel.aux_vars(i).orig_lead_lag)+1) = ... @@ -49,7 +49,7 @@ if isempty(initialconditions) end yinitdata = flip(yinitdata, 2); end - if DynareModel.max_exo_lag_orig>0 + if DynareModel.orig_maximum_exo_lag>0 for i = 1:length(DynareModel.aux_vars) if DynareModel.aux_vars(i).type==3 xinitdata(DynareModel.aux_vars(i).orig_index, abs(DynareModel.aux_vars(i).orig_lead_lag)+1) = ... diff --git a/matlab/set_historical_values.m b/matlab/set_historical_values.m index 817228dab..237d84dad 100644 --- a/matlab/set_historical_values.m +++ b/matlab/set_historical_values.m @@ -37,7 +37,7 @@ if ischar(initialperiod) end % Initialize endo_histval. -M_.endo_histval = zeros(M_.endo_nbr, M_.max_endo_lag_orig); +M_.endo_histval = zeros(M_.endo_nbr, M_.orig_maximum_endo_lag); % Fill endo_histval. k = 1; diff --git a/preprocessor b/preprocessor index 4897ab7d6..250106f1d 160000 --- a/preprocessor +++ b/preprocessor @@ -1 +1 @@ -Subproject commit 4897ab7d6955dd209aa3f417374f7287fee9ae9b +Subproject commit 250106f1d2357d3df8e8905a9709e3962f28b896