diff --git a/matlab/+pac/estimate.m b/matlab/+pac/estimate.m index 4d0431aff..df800a3c3 100644 --- a/matlab/+pac/estimate.m +++ b/matlab/+pac/estimate.m @@ -95,7 +95,7 @@ for i=1:length(ipnames_) end % Add the auxiliary variables in the dataset. -data = feval([M_.fname '_dynamic_set_auxiliary_series'], data, M_.params); +data = feval([M_.fname '.dynamic_set_auxiliary_series'], data, M_.params); % Check that the data for endogenous variables have values. Note that we % also need data in range(1)-1 for the lagged variables, and we do not test diff --git a/matlab/backward/checkdatabase.m b/matlab/backward/checkdatabase.m index d58f16a7b..1b9d55d5b 100644 --- a/matlab/backward/checkdatabase.m +++ b/matlab/backward/checkdatabase.m @@ -33,7 +33,7 @@ end set_auxiliary_series = [DynareModel.fname '.dynamic_set_auxiliary_series']; -if exist([set_auxiliary_series '.m']) +if exist(['+' DynareModel.fname filesep() 'dynamic_set_auxiliary_series']) dbase = feval(set_auxiliary_series, dbase, DynareModel.params); end diff --git a/matlab/block_bytecode_mfs_steadystate.m b/matlab/block_bytecode_mfs_steadystate.m index a34b15c19..26bd0fac5 100644 --- a/matlab/block_bytecode_mfs_steadystate.m +++ b/matlab/block_bytecode_mfs_steadystate.m @@ -1,5 +1,5 @@ function [r, g1] = block_bytecode_mfs_steadystate(y, b, y_all, exo, params, M) -% Wrapper around the *_static.m file, for use with dynare_solve, +% Wrapper around the static.m file, for use with dynare_solve, % when block_mfs option is given to steady. % Copyright (C) 2009-2012 Dynare Team diff --git a/matlab/block_mfs_steadystate.m b/matlab/block_mfs_steadystate.m index a0793e674..4ba49ef39 100644 --- a/matlab/block_mfs_steadystate.m +++ b/matlab/block_mfs_steadystate.m @@ -1,5 +1,5 @@ function [r, g1] = block_mfs_steadystate(y, b, y_all, exo, params, M) -% Wrapper around the *_static.m file, for use with dynare_solve, +% Wrapper around the static.m file, for use with dynare_solve, % when block_mfs option is given to steady. % Copyright (C) 2009-2012 Dynare Team diff --git a/matlab/bytecode_steadystate.m b/matlab/bytecode_steadystate.m index 4c3e2f46f..49c619fe8 100644 --- a/matlab/bytecode_steadystate.m +++ b/matlab/bytecode_steadystate.m @@ -1,5 +1,5 @@ function [r, g1] = bytecode_steadystate(y, exo, params) -% Wrapper around the *_static.m file, for use with dynare_solve, +% Wrapper around the static.m file, for use with dynare_solve, % when block_mfs option is given to steady. % Copyright (C) 2009-2011 Dynare Team diff --git a/matlab/get_ar_ec_matrices.m b/matlab/get_ar_ec_matrices.m index cd9a946fe..a2920f8ba 100644 --- a/matlab/get_ar_ec_matrices.m +++ b/matlab/get_ar_ec_matrices.m @@ -46,7 +46,7 @@ if ~isfield(M_.var, var_model_name) end %% Call Dynamic Function -[junk, g1] = feval([M_.fname '_dynamic'], ... +[junk, g1] = feval([M_.fname '.dynamic'], ... ones(max(max(M_.lead_lag_incidence)), 1), ... ones(1, M_.exo_nbr), ... M_.params, ... diff --git a/matlab/perfect-foresight-models/perfect_foresight_mcp_problem.m b/matlab/perfect-foresight-models/perfect_foresight_mcp_problem.m index 000fff50f..8679a2627 100644 --- a/matlab/perfect-foresight-models/perfect_foresight_mcp_problem.m +++ b/matlab/perfect-foresight-models/perfect_foresight_mcp_problem.m @@ -13,7 +13,7 @@ function [residuals,JJacobian] = perfect_foresight_mcp_problem(y, dynamic_functi % % INPUTS % y [double] N*1 array, terminal conditions for the endogenous variables -% dynamic_function [handle] function handle to _dynamic-file +% dynamic_function [handle] function handle to the dynamic routine % Y0 [double] N*1 array, initial conditions for the endogenous variables % YT [double] N*1 array, terminal conditions for the endogenous variables % exo_simul [double] nperiods*M_.exo_nbr matrix of exogenous variables (in declaration order) @@ -24,7 +24,7 @@ function [residuals,JJacobian] = perfect_foresight_mcp_problem(y, dynamic_functi % T [scalar] number of simulation periods % ny [scalar] number of endogenous variables % i_cols [double] indices of variables appearing in M.lead_lag_incidence -% and that need to be passed to _dynamic-file +% and that need to be passed to the dynamic routine % i_cols_J1 [double] indices of contemporaneous and forward looking variables % appearing in M.lead_lag_incidence % i_cols_1 [double] indices of contemporaneous and forward looking variables in diff --git a/matlab/perfect-foresight-models/perfect_foresight_problem.m b/matlab/perfect-foresight-models/perfect_foresight_problem.m index c6c6f77a7..00f782038 100644 --- a/matlab/perfect-foresight-models/perfect_foresight_problem.m +++ b/matlab/perfect-foresight-models/perfect_foresight_problem.m @@ -12,7 +12,7 @@ function [residuals,JJacobian] = perfect_foresight_problem(y, dynamic_function, % % INPUTS % y [double] N*1 array, terminal conditions for the endogenous variables -% dynamic_function [handle] function handle to _dynamic-file +% dynamic_function [handle] function handle to the dynamic routine % Y0 [double] N*1 array, initial conditions for the endogenous variables % YT [double] N*1 array, terminal conditions for the endogenous variables % exo_simul [double] nperiods*M_.exo_nbr matrix of exogenous variables (in declaration order) @@ -23,7 +23,7 @@ function [residuals,JJacobian] = perfect_foresight_problem(y, dynamic_function, % T [scalar] number of simulation periods % ny [scalar] number of endogenous variables % i_cols [double] indices of variables appearing in M.lead_lag_incidence -% and that need to be passed to _dynamic-file +% and that need to be passed to the dynamic routine % i_cols_J1 [double] indices of contemporaneous and forward looking variables % appearing in M.lead_lag_incidence % i_cols_1 [double] indices of contemporaneous and forward looking variables in diff --git a/matlab/perfect-foresight-models/private/initialize_stacked_problem.m b/matlab/perfect-foresight-models/private/initialize_stacked_problem.m index 1a8f61838..d7675f7c0 100644 --- a/matlab/perfect-foresight-models/private/initialize_stacked_problem.m +++ b/matlab/perfect-foresight-models/private/initialize_stacked_problem.m @@ -15,7 +15,7 @@ function [options, y0, yT, z, i_cols, i_cols_J1, i_cols_T, i_cols_j, i_cols_1, . % - yT [double] N*1 array, terminal conditions for the endogenous variables % - z [double] T*M array, paths for the exogenous variables. % - i_cols [double] indices of variables appearing in M.lead_lag_incidence -% and that need to be passed to _dynamic-file +% and that need to be passed to the dynamic routine % - i_cols_J1 [double] indices of contemporaneous and forward looking variables % appearing in M.lead_lag_incidence % - i_cols_T [double] columns of dynamic Jacobian related to @@ -25,7 +25,7 @@ function [options, y0, yT, z, i_cols, i_cols_J1, i_cols_T, i_cols_j, i_cols_1, . % in dynamic Jacobian (relevant in intermediate periods) % - i_cols_1 [double] indices of contemporaneous and forward looking variables in % M.lead_lag_incidence in dynamic Jacobian (relevant in first period) -% - dynamicmodel [handle] function handle to _dynamic-file +% - dynamicmodel [handle] function handle to the dynamic routine % Copyright (C) 2015-2017 Dynare Team %