From 1ac7344e42a105e8e6e04dd40a44fadaec6f41df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Thu, 19 Dec 2019 17:20:38 +0100 Subject: [PATCH] Rollback introduction of +get and +set folders MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Under Octave, having namespaces called “get” and “set” overshadows the builtin functions with the same names, which are needed for graphics manipulation. Therefore we go back to the initial function naming scheme, but moving all those functions under an “accessors” subdirectory. Among other things, this is a revert of e4134ab59b71fc1d7abd123f042f1ee079bee267 and c5e86fcb59768786ff9a31982eef93c77c1b26d0. Ref. !1655, !1686 --- matlab/{+get/irf.m => accessors/get_irf.m} | 0 matlab/{+get/mean.m => accessors/get_mean.m} | 0 .../get_param_by_name.m} | 0 .../get_shock_stderr_by_name.m} | 0 .../{+get/smooth.m => accessors/get_smooth.m} | 0 .../{+get/update.m => accessors/get_update.m} | 0 .../set_param_value.m} | 0 .../set_shock_stderr_value.m} | 0 matlab/dynare_config.m | 1 + .../lola_solve_one_boundary.mod | 70 +++++++++---------- tests/homotopy/common.mod | 2 +- 11 files changed, 37 insertions(+), 36 deletions(-) rename matlab/{+get/irf.m => accessors/get_irf.m} (100%) rename matlab/{+get/mean.m => accessors/get_mean.m} (100%) rename matlab/{+get/param_by_name.m => accessors/get_param_by_name.m} (100%) rename matlab/{+get/shock_stderr_by_name.m => accessors/get_shock_stderr_by_name.m} (100%) rename matlab/{+get/smooth.m => accessors/get_smooth.m} (100%) rename matlab/{+get/update.m => accessors/get_update.m} (100%) rename matlab/{+set/param_value.m => accessors/set_param_value.m} (100%) rename matlab/{+set/shock_stderr_value.m => accessors/set_shock_stderr_value.m} (100%) diff --git a/matlab/+get/irf.m b/matlab/accessors/get_irf.m similarity index 100% rename from matlab/+get/irf.m rename to matlab/accessors/get_irf.m diff --git a/matlab/+get/mean.m b/matlab/accessors/get_mean.m similarity index 100% rename from matlab/+get/mean.m rename to matlab/accessors/get_mean.m diff --git a/matlab/+get/param_by_name.m b/matlab/accessors/get_param_by_name.m similarity index 100% rename from matlab/+get/param_by_name.m rename to matlab/accessors/get_param_by_name.m diff --git a/matlab/+get/shock_stderr_by_name.m b/matlab/accessors/get_shock_stderr_by_name.m similarity index 100% rename from matlab/+get/shock_stderr_by_name.m rename to matlab/accessors/get_shock_stderr_by_name.m diff --git a/matlab/+get/smooth.m b/matlab/accessors/get_smooth.m similarity index 100% rename from matlab/+get/smooth.m rename to matlab/accessors/get_smooth.m diff --git a/matlab/+get/update.m b/matlab/accessors/get_update.m similarity index 100% rename from matlab/+get/update.m rename to matlab/accessors/get_update.m diff --git a/matlab/+set/param_value.m b/matlab/accessors/set_param_value.m similarity index 100% rename from matlab/+set/param_value.m rename to matlab/accessors/set_param_value.m diff --git a/matlab/+set/shock_stderr_value.m b/matlab/accessors/set_shock_stderr_value.m similarity index 100% rename from matlab/+set/shock_stderr_value.m rename to matlab/accessors/set_shock_stderr_value.m diff --git a/matlab/dynare_config.m b/matlab/dynare_config.m index 04225a5b9..b3ecd6450 100644 --- a/matlab/dynare_config.m +++ b/matlab/dynare_config.m @@ -61,6 +61,7 @@ p = {'/distributions/' ; ... '/cli/' ; ... '/lmmcp/' ; ... '/optimization/' ; ... + '/accessors/' ; ... '/modules/dseries/src/' ; ... '/utilities/doc/' ; ... '/utilities/tests/src/' ; ... diff --git a/tests/deterministic_simulations/lola_solve_one_boundary.mod b/tests/deterministic_simulations/lola_solve_one_boundary.mod index 791b732b0..a293647fc 100644 --- a/tests/deterministic_simulations/lola_solve_one_boundary.mod +++ b/tests/deterministic_simulations/lola_solve_one_boundary.mod @@ -96,50 +96,50 @@ eps_Ds eps_phijs eps_PensCorr_L eps_PensCorr_F; % ============================================================ @#for i in wg -set.param_value('Du@{i}',Du@{i}); -set.param_value('Dn@{i}',Dn@{i}); -set.param_value('h@{i}',h@{i}); -set.param_value('h@{i}_f',h@{i}_f); -set.param_value('chi@{i}',chi@{i}); -set.param_value('eta@{i}b',eta@{i}b); +set_param_value('Du@{i}',Du@{i}); +set_param_value('Dn@{i}',Dn@{i}); +set_param_value('h@{i}',h@{i}); +set_param_value('h@{i}_f',h@{i}_f); +set_param_value('chi@{i}',chi@{i}); +set_param_value('eta@{i}b',eta@{i}b); @#endfor @#for i in erg -set.param_value('De_@{i}b',De_@{i}b); +set_param_value('De_@{i}b',De_@{i}b); @#endfor -set.param_value('rho',rho); -set.param_value('phi',phi); -set.param_value('delta',delta); -set.param_value('alpha',alpha); -set.param_value('beta',beta); -set.param_value('ann',ann); -set.param_value('fc',fc); -set.param_value('nu',nu); -set.param_value('aa',aa); +set_param_value('rho',rho); +set_param_value('phi',phi); +set_param_value('delta',delta); +set_param_value('alpha',alpha); +set_param_value('beta',beta); +set_param_value('ann',ann); +set_param_value('fc',fc); +set_param_value('nu',nu); +set_param_value('aa',aa); -set.param_value('rhoub',rhoub); -set.param_value('rhoeb',rhoeb); -set.param_value('rholb',rholb); -set.param_value('tauwb',tauwb); -set.param_value('taucb',taucb); -set.param_value('taufb',taufb); -set.param_value('taukb',taukb); -set.param_value('gb',gb); +set_param_value('rhoub',rhoub); +set_param_value('rhoeb',rhoeb); +set_param_value('rholb',rholb); +set_param_value('tauwb',tauwb); +set_param_value('taucb',taucb); +set_param_value('taufb',taufb); +set_param_value('taukb',taukb); +set_param_value('gb',gb); -set.param_value('TFPb',TFPb); -set.param_value('ghb',ghb); -set.param_value('rrbb',rrbb); +set_param_value('TFPb',TFPb); +set_param_value('ghb',ghb); +set_param_value('rrbb',rrbb); -set.param_value('thetab',thetab); -set.param_value('tau1b',tau1b); -set.param_value('om1b',om1b); -set.param_value('om2b',om2b); -set.param_value('om2sb',om2sb); -set.param_value('Dsb',Dsb); -set.param_value('phijsb',phijsb); +set_param_value('thetab',thetab); +set_param_value('tau1b',tau1b); +set_param_value('om1b',om1b); +set_param_value('om2b',om2b); +set_param_value('om2sb',om2sb); +set_param_value('Dsb',Dsb); +set_param_value('phijsb',phijsb); -set.param_value('bsY_iss',bsY_iss); +set_param_value('bsY_iss',bsY_iss); NBRYb=NBR_iss/(phii_iss*gdp_iss); diff --git a/tests/homotopy/common.mod b/tests/homotopy/common.mod index e8023cdf4..347dd464a 100644 --- a/tests/homotopy/common.mod +++ b/tests/homotopy/common.mod @@ -30,6 +30,6 @@ if abs(oo_.steady_state(1)/(aa*oo_.exo_steady_state(1)*oo_.steady_state(2)^alph- error('Error in homotopy for c') end -if abs(oo_.steady_state(2)/((delt+get.param_by_name('bet'))/(aa*oo_.exo_steady_state(1)*alph))^(1/(alph-1)) - 1) > 1e-4 +if abs(oo_.steady_state(2)/((delt+get_param_by_name('bet'))/(aa*oo_.exo_steady_state(1)*alph))^(1/(alph-1)) - 1) > 1e-4 error('Error in homotopy for k') end