Fixes related to the new "+" subfolder.
parent
bc9dbbc951
commit
51332c6fd6
|
@ -95,7 +95,7 @@ for i=1:length(ipnames_)
|
||||||
end
|
end
|
||||||
|
|
||||||
% Add the auxiliary variables in the dataset.
|
% 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
|
% 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
|
% also need data in range(1)-1 for the lagged variables, and we do not test
|
||||||
|
|
|
@ -33,7 +33,7 @@ end
|
||||||
|
|
||||||
set_auxiliary_series = [DynareModel.fname '.dynamic_set_auxiliary_series'];
|
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);
|
dbase = feval(set_auxiliary_series, dbase, DynareModel.params);
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
function [r, g1] = block_bytecode_mfs_steadystate(y, b, y_all, exo, params, M)
|
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.
|
% when block_mfs option is given to steady.
|
||||||
|
|
||||||
% Copyright (C) 2009-2012 Dynare Team
|
% Copyright (C) 2009-2012 Dynare Team
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
function [r, g1] = block_mfs_steadystate(y, b, y_all, exo, params, M)
|
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.
|
% when block_mfs option is given to steady.
|
||||||
|
|
||||||
% Copyright (C) 2009-2012 Dynare Team
|
% Copyright (C) 2009-2012 Dynare Team
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
function [r, g1] = bytecode_steadystate(y, exo, params)
|
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.
|
% when block_mfs option is given to steady.
|
||||||
|
|
||||||
% Copyright (C) 2009-2011 Dynare Team
|
% Copyright (C) 2009-2011 Dynare Team
|
||||||
|
|
|
@ -46,7 +46,7 @@ if ~isfield(M_.var, var_model_name)
|
||||||
end
|
end
|
||||||
|
|
||||||
%% Call Dynamic Function
|
%% Call Dynamic Function
|
||||||
[junk, g1] = feval([M_.fname '_dynamic'], ...
|
[junk, g1] = feval([M_.fname '.dynamic'], ...
|
||||||
ones(max(max(M_.lead_lag_incidence)), 1), ...
|
ones(max(max(M_.lead_lag_incidence)), 1), ...
|
||||||
ones(1, M_.exo_nbr), ...
|
ones(1, M_.exo_nbr), ...
|
||||||
M_.params, ...
|
M_.params, ...
|
||||||
|
|
|
@ -13,7 +13,7 @@ function [residuals,JJacobian] = perfect_foresight_mcp_problem(y, dynamic_functi
|
||||||
%
|
%
|
||||||
% INPUTS
|
% INPUTS
|
||||||
% y [double] N*1 array, terminal conditions for the endogenous variables
|
% 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
|
% Y0 [double] N*1 array, initial conditions for the endogenous variables
|
||||||
% YT [double] N*1 array, terminal 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)
|
% 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
|
% T [scalar] number of simulation periods
|
||||||
% ny [scalar] number of endogenous variables
|
% ny [scalar] number of endogenous variables
|
||||||
% i_cols [double] indices of variables appearing in M.lead_lag_incidence
|
% 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
|
% i_cols_J1 [double] indices of contemporaneous and forward looking variables
|
||||||
% appearing in M.lead_lag_incidence
|
% appearing in M.lead_lag_incidence
|
||||||
% i_cols_1 [double] indices of contemporaneous and forward looking variables in
|
% i_cols_1 [double] indices of contemporaneous and forward looking variables in
|
||||||
|
|
|
@ -12,7 +12,7 @@ function [residuals,JJacobian] = perfect_foresight_problem(y, dynamic_function,
|
||||||
%
|
%
|
||||||
% INPUTS
|
% INPUTS
|
||||||
% y [double] N*1 array, terminal conditions for the endogenous variables
|
% 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
|
% Y0 [double] N*1 array, initial conditions for the endogenous variables
|
||||||
% YT [double] N*1 array, terminal 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)
|
% 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
|
% T [scalar] number of simulation periods
|
||||||
% ny [scalar] number of endogenous variables
|
% ny [scalar] number of endogenous variables
|
||||||
% i_cols [double] indices of variables appearing in M.lead_lag_incidence
|
% 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
|
% i_cols_J1 [double] indices of contemporaneous and forward looking variables
|
||||||
% appearing in M.lead_lag_incidence
|
% appearing in M.lead_lag_incidence
|
||||||
% i_cols_1 [double] indices of contemporaneous and forward looking variables in
|
% i_cols_1 [double] indices of contemporaneous and forward looking variables in
|
||||||
|
|
|
@ -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
|
% - yT [double] N*1 array, terminal conditions for the endogenous variables
|
||||||
% - z [double] T*M array, paths for the exogenous variables.
|
% - z [double] T*M array, paths for the exogenous variables.
|
||||||
% - i_cols [double] indices of variables appearing in M.lead_lag_incidence
|
% - 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
|
% - i_cols_J1 [double] indices of contemporaneous and forward looking variables
|
||||||
% appearing in M.lead_lag_incidence
|
% appearing in M.lead_lag_incidence
|
||||||
% - i_cols_T [double] columns of dynamic Jacobian related to
|
% - 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)
|
% in dynamic Jacobian (relevant in intermediate periods)
|
||||||
% - i_cols_1 [double] indices of contemporaneous and forward looking variables in
|
% - i_cols_1 [double] indices of contemporaneous and forward looking variables in
|
||||||
% M.lead_lag_incidence in dynamic Jacobian (relevant in first period)
|
% 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
|
% Copyright (C) 2015-2017 Dynare Team
|
||||||
%
|
%
|
||||||
|
|
Loading…
Reference in New Issue