diff --git a/tests/.gitignore b/tests/.gitignore index 3d7ccec14ddbb1e17ab97eb5ed9618ffab9cf8c6..b1d306b68fd5eedc797c3ba5929eafd51aeb3719 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -162,7 +162,7 @@ wsOct !/smoother2histval/fsdat_simul.m !/steady_state/walsh1_old_ss_steadystate.m -/pac/var-6/example/model/pac-expectations/* -/pac/var-5/example/model/pac-expectations/* -/pac/trend-component-14/example/model/pac-expectations/* +/pac/var-6/example1/model/pac-expectations/* +/pac/var-5/example1/model/pac-expectations/* +/pac/trend-component-14/example1/model/pac-expectations/* !/ecb/aggregate/test_aggregate_routine.m diff --git a/tests/Makefile.am b/tests/Makefile.am index 1124c4d839faef4cecb0d5c9100029b21598e353..dd596f69bdf2f2773d934bddbcbcf0875a6c4680 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -420,19 +420,19 @@ MODFILES = \ particle/local_state_space_iteration_k_test.mod ECB_MODFILES = \ - var-expectations/1/example.mod \ - var-expectations/2/example.mod \ - var-expectations/3/example.mod \ - var-expectations/4/example.mod \ - var-expectations/5/example.mod \ - var-expectations/6/example.mod \ + var-expectations/1/example1.mod \ + var-expectations/2/example1.mod \ + var-expectations/3/example1.mod \ + var-expectations/4/example1.mod \ + var-expectations/5/example1.mod \ + var-expectations/6/example1.mod \ var-expectations/6/substitution.mod \ - var-expectations/7/example.mod \ + var-expectations/7/example1.mod \ var-expectations/7/substitution.mod \ - var-expectations/8/example.mod \ + var-expectations/8/example1.mod \ var-expectations/8/substitution.mod \ - var-expectations/9/example.mod \ - var-expectations/10/example.mod \ + var-expectations/9/example1.mod \ + var-expectations/10/example1.mod \ trend-component-and-var-models/vm1.mod \ trend-component-and-var-models/vm2.mod \ trend-component-and-var-models/vm3.mod \ @@ -458,52 +458,52 @@ ECB_MODFILES = \ trend-component-and-var-models/legacy/tcm3.mod \ trend-component-and-var-models/legacy/tcm4.mod \ trend-component-and-var-models/legacy/tcm5.mod \ - pac/var-1/example.mod \ - pac/var-2/example.mod \ - pac/var-3/example.mod \ - pac/var-4/example.mod \ - pac/var-5/example.mod \ + pac/var-1/example1.mod \ + pac/var-2/example1.mod \ + pac/var-3/example1.mod \ + pac/var-4/example1.mod \ + pac/var-5/example1.mod \ pac/var-5/substitution.mod \ - pac/var-6/example.mod \ + pac/var-6/example1.mod \ pac/var-6/substitution.mod \ - pac/trend-component-1/example.mod \ - pac/trend-component-2/example.mod \ - pac/trend-component-3/example.mod \ - pac/trend-component-4/example.mod \ - pac/trend-component-5/example.mod \ - pac/trend-component-6/example.mod \ - pac/trend-component-7/example.mod \ - pac/trend-component-9/example.mod \ - pac/trend-component-10/example.mod \ - pac/trend-component-11/example.mod \ - pac/trend-component-12/example.mod \ - pac/trend-component-13a/example.mod \ - pac/trend-component-13b/example.mod \ - pac/trend-component-14/example.mod \ + pac/trend-component-1/example1.mod \ + pac/trend-component-2/example1.mod \ + pac/trend-component-3/example1.mod \ + pac/trend-component-4/example1.mod \ + pac/trend-component-5/example1.mod \ + pac/trend-component-6/example1.mod \ + pac/trend-component-7/example1.mod \ + pac/trend-component-9/example1.mod \ + pac/trend-component-10/example1.mod \ + pac/trend-component-11/example1.mod \ + pac/trend-component-12/example1.mod \ + pac/trend-component-13a/example1.mod \ + pac/trend-component-13b/example1.mod \ + pac/trend-component-14/example1.mod \ pac/trend-component-14/substitution.mod \ - pac/trend-component-15/example.mod \ - pac/trend-component-16/example.mod \ - pac/trend-component-17/example.mod \ - pac/trend-component-18/example.mod \ + pac/trend-component-15/example1.mod \ + pac/trend-component-16/example1.mod \ + pac/trend-component-17/example1.mod \ + pac/trend-component-18/example1.mod \ pac/trend-component-19/example1.mod \ pac/trend-component-19/example2.mod \ pac/trend-component-19/example3.mod \ - pac/trend-component-19-growth-lin-comb/example.mod \ + pac/trend-component-19-growth-lin-comb/example1.mod \ pac/trend-component-1-mce/example_det.mod \ pac/trend-component-1-mce/example_sto.mod \ pac/trend-component-2-mce/example_det.mod \ pac/trend-component-2-mce/example_sto.mod \ - pac/trend-component-20-1/example.mod \ - pac/trend-component-20-2/example.mod \ - pac/trend-component-20-3/example.mod \ - pac/trend-component-20-4/example.mod \ - pac/trend-component-21/example.mod \ - pac/trend-component-22/example.mod \ - pac/trend-component-23/example.mod \ - pac/trend-component-24/example.mod \ - pac/trend-component-25/example.mod \ - pac/trend-component-26/example.mod \ - pac/trend-component-27/example.mod \ + pac/trend-component-20-1/example1.mod \ + pac/trend-component-20-2/example1.mod \ + pac/trend-component-20-3/example1.mod \ + pac/trend-component-20-4/example1.mod \ + pac/trend-component-21/example1.mod \ + pac/trend-component-22/example1.mod \ + pac/trend-component-23/example1.mod \ + pac/trend-component-24/example1.mod \ + pac/trend-component-25/example1.mod \ + pac/trend-component-26/example1.mod \ + pac/trend-component-27/example1.mod \ pac/trend-component-28/example1.mod \ pac/trend-component-28/example2.mod \ pac/trend-component-28/example3.mod \ @@ -512,7 +512,7 @@ ECB_MODFILES = \ pac/trend-component-28/example6.mod \ pac/trend-component-29/example1.mod \ pac/trend-component-29/example2.mod \ - pac/trend-component-30/example.mod \ + pac/trend-component-30/example1.mod \ write/example1.mod \ ecb/backward-models/irf/solow_1.mod \ ecb/backward-models/irf/solow_2.mod \ @@ -777,25 +777,25 @@ kalman/likelihood_from_dynare/fs2000ns_uncorr_ME_missing.o.trs: kalman/likelihoo kalman/likelihood_from_dynare/fs2000ns_corr_ME_missing.m.trs: kalman/likelihood_from_dynare/fs2000ns_uncorr_ME.m.trs kalman/likelihood_from_dynare/fs2000ns_corr_ME_missing.o.trs: kalman/likelihood_from_dynare/fs2000ns_uncorr_ME.o.trs -var-expectations/6/substitution.m.trs: var-expectations/6/example.m.trs -var-expectations/6/substitution.o.trs: var-expectations/6/example.o.trs -var-expectations/7/substitution.m.trs: var-expectations/7/example.m.trs -var-expectations/7/substitution.o.trs: var-expectations/7/example.o.trs -var-expectations/8/substitution.m.trs: var-expectations/8/example.m.trs -var-expectations/8/substitution.o.trs: var-expectations/8/example.o.trs +var-expectations/6/substitution.m.trs: var-expectations/6/example1.m.trs +var-expectations/6/substitution.o.trs: var-expectations/6/example1.o.trs +var-expectations/7/substitution.m.trs: var-expectations/7/example1.m.trs +var-expectations/7/substitution.o.trs: var-expectations/7/example1.o.trs +var-expectations/8/substitution.m.trs: var-expectations/8/example1.m.trs +var-expectations/8/substitution.o.trs: var-expectations/8/example1.o.trs -pac/var-5/substitution.m.trs: pac/var-5/example.m.trs -pac/var-5/substitution.o.trs: pac/var-5/example.o.trs -pac/var-6/substitution.m.trs: pac/var-6/example.m.trs -pac/var-6/substitution.o.trs: pac/var-6/example.o.trs -pac/trend-component-14/substitution.m.trs: pac/trend-component-14/example.m.trs -pac/trend-component-14/substitution.o.trs: pac/trend-component-14/example.o.trs +pac/var-5/substitution.m.trs: pac/var-5/example1.m.trs +pac/var-5/substitution.o.trs: pac/var-5/example1.o.trs +pac/var-6/substitution.m.trs: pac/var-6/example1.m.trs +pac/var-6/substitution.o.trs: pac/var-6/example1.o.trs +pac/trend-component-14/substitution.m.trs: pac/trend-component-14/example1.m.trs +pac/trend-component-14/substitution.o.trs: pac/trend-component-14/example1.o.trs lmmcp/sw_newton.m.trs: lmmcp/sw_lmmcp.m.trs lmmcp/sw_newton.o.trs: lmmcp/sw_lmmcp.o.trs -var-expectations/4/example.m.trs: var-expectations/3/example.m.trs -var-expectations/4/example.o.trs: var-expectations/3/example.o.trs +var-expectations/4/example1.m.trs: var-expectations/3/example1.m.trs +var-expectations/4/example1.o.trs: var-expectations/3/example1.o.trs trend-component-and-var-models/tcm7.m.trs: trend-component-and-var-models/tcm6.m.trs trend-component-and-var-models/tcm7.o.trs: trend-component-and-var-models/tcm6.o.trs diff --git a/tests/pac/trend-component-1/clean b/tests/pac/trend-component-1/clean index be0d5e00cdb49fa48f99aa6470ff0578973bbce3..84ef9f4e31471cba80a068c838ce27ee2d98a265 100755 --- a/tests/pac/trend-component-1/clean +++ b/tests/pac/trend-component-1/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example*.mat -rm -f example.log \ No newline at end of file +rm -rf example1 +rm -rf +example1 +rm -f example1*.mat +rm -f example1.log \ No newline at end of file diff --git a/tests/pac/trend-component-1/example.mod b/tests/pac/trend-component-1/example1.mod similarity index 100% rename from tests/pac/trend-component-1/example.mod rename to tests/pac/trend-component-1/example1.mod diff --git a/tests/pac/trend-component-10/clean b/tests/pac/trend-component-10/clean index bdc7da19ab956a4a155e5fc8cbdf9a11ebbebff0..3c173825b16372789b880a499b8c235a1d8eba51 100755 --- a/tests/pac/trend-component-10/clean +++ b/tests/pac/trend-component-10/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat \ No newline at end of file diff --git a/tests/pac/trend-component-10/example.mod b/tests/pac/trend-component-10/example1.mod similarity index 100% rename from tests/pac/trend-component-10/example.mod rename to tests/pac/trend-component-10/example1.mod diff --git a/tests/pac/trend-component-11/clean b/tests/pac/trend-component-11/clean index 2935a38ad605cee3810c18217e54906355524374..13f5ef3a4f3ecf4f4d34da2519598624231ff981 100755 --- a/tests/pac/trend-component-11/clean +++ b/tests/pac/trend-component-11/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example*.mat -rm -f example.log \ No newline at end of file +rm -rf example1 +rm -rf +example1 +rm -f example1*.mat +rm -f example1.log \ No newline at end of file diff --git a/tests/pac/trend-component-11/example.mod b/tests/pac/trend-component-11/example1.mod similarity index 100% rename from tests/pac/trend-component-11/example.mod rename to tests/pac/trend-component-11/example1.mod diff --git a/tests/pac/trend-component-12/clean b/tests/pac/trend-component-12/clean index bdc7da19ab956a4a155e5fc8cbdf9a11ebbebff0..3c173825b16372789b880a499b8c235a1d8eba51 100755 --- a/tests/pac/trend-component-12/clean +++ b/tests/pac/trend-component-12/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat \ No newline at end of file diff --git a/tests/pac/trend-component-12/example.mod b/tests/pac/trend-component-12/example1.mod similarity index 100% rename from tests/pac/trend-component-12/example.mod rename to tests/pac/trend-component-12/example1.mod diff --git a/tests/pac/trend-component-13a/clean b/tests/pac/trend-component-13a/clean index bdc7da19ab956a4a155e5fc8cbdf9a11ebbebff0..3c173825b16372789b880a499b8c235a1d8eba51 100755 --- a/tests/pac/trend-component-13a/clean +++ b/tests/pac/trend-component-13a/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat \ No newline at end of file diff --git a/tests/pac/trend-component-13a/example.mod b/tests/pac/trend-component-13a/example1.mod similarity index 100% rename from tests/pac/trend-component-13a/example.mod rename to tests/pac/trend-component-13a/example1.mod diff --git a/tests/pac/trend-component-13b/clean b/tests/pac/trend-component-13b/clean index bdc7da19ab956a4a155e5fc8cbdf9a11ebbebff0..3c173825b16372789b880a499b8c235a1d8eba51 100755 --- a/tests/pac/trend-component-13b/clean +++ b/tests/pac/trend-component-13b/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat \ No newline at end of file diff --git a/tests/pac/trend-component-13b/example.mod b/tests/pac/trend-component-13b/example1.mod similarity index 100% rename from tests/pac/trend-component-13b/example.mod rename to tests/pac/trend-component-13b/example1.mod diff --git a/tests/pac/trend-component-14/clean b/tests/pac/trend-component-14/clean index 4ca44cac853dd69f009110c0ff32d500efe8423a..1a5ffd9711dc8169734fc394237897c9d60d5d79 100755 --- a/tests/pac/trend-component-14/clean +++ b/tests/pac/trend-component-14/clean @@ -1,8 +1,8 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm -rf substitution rm -rf +substitution diff --git a/tests/pac/trend-component-14/example.mod b/tests/pac/trend-component-14/example1.mod similarity index 92% rename from tests/pac/trend-component-14/example.mod rename to tests/pac/trend-component-14/example1.mod index d1dff12d81caf95805627e265e443838756d972a..232dca925155f3611f82df84f9db3d3255d2674c 100644 --- a/tests/pac/trend-component-14/example.mod +++ b/tests/pac/trend-component-14/example1.mod @@ -86,8 +86,8 @@ verbatim; y = zeros(M_.endo_nbr,1); y(1:M_.orig_endo_nbr) = rand(M_.orig_endo_nbr, 1); x = randn(M_.exo_nbr,1); - y = example.set_auxiliary_variables(y, x, M_.params); + y = example1.set_auxiliary_variables(y, x, M_.params); y = [y(find(M_.lead_lag_incidence(1,:))); y]; - [residual, g1] = example.dynamic(y, x', M_.params, oo_.steady_state, 1); - save('example.mat', 'residual', 'g1', 'TrueData'); + [residual, g1] = example1.dynamic(y, x', M_.params, oo_.steady_state, 1); + save('example1.mat', 'residual', 'g1', 'TrueData'); end; \ No newline at end of file diff --git a/tests/pac/trend-component-14/substitution.mod b/tests/pac/trend-component-14/substitution.mod index 6070b5b2af4f6189a064dce36c1f7b1774315632..6761227e24a5ba21f38d0cdbf2b8fc7457e6a14d 100644 --- a/tests/pac/trend-component-14/substitution.mod +++ b/tests/pac/trend-component-14/substitution.mod @@ -30,7 +30,7 @@ e_c_m = .5; c_z_1 = .2; c_z_2 = -.1; -@#include "example/model/pac-expectations/eq0-pacman-parameters.inc" +@#include "example1/model/pac-expectations/eq0-pacman-parameters.inc" model; @@ -51,7 +51,7 @@ x2bar = x2bar(-1) + ex2bar; [name='zpac'] diff(z) = e_c_m*(x1(-1)-z(-1)) + c_z_1*diff(z(-1)) + c_z_2*diff(z(-2)) + -@#include "example/model/pac-expectations/eq0-pacman-expression.inc" +@#include "example1/model/pac-expectations/eq0-pacman-expression.inc" + ez; end; @@ -79,20 +79,20 @@ verbatim; x = randn(M_.exo_nbr,1); y = substitution.set_auxiliary_variables(y, x, M_.params); y = [y(find(M_.lead_lag_incidence(1,:))); y]; - example = load('example.mat'); + example1 = load('example1.mat'); [residual, g1] = substitution.dynamic(y, x', M_.params, oo_.steady_state, 1); end; -if max(abs(example.TrueData.data(:)-TrueData.data(:)))>1e-9 +if max(abs(example1.TrueData.data(:)-TrueData.data(:)))>1e-9 error('Simulations do not match.') end -if ~isequal(length(residual), length(example.residual)) || max(abs(example.residual-residual))>1e-8 +if ~isequal(length(residual), length(example1.residual)) || max(abs(example1.residual-residual))>1e-8 warning('Residuals do not match!') end -if ~isequal(length(g1(:)), length(example.g1(:))) || max(abs(example.g1(:)-g1(:)))>1e-8 +if ~isequal(length(g1(:)), length(example1.g1(:))) || max(abs(example1.g1(:)-g1(:)))>1e-8 warning('Jacobian matrices do not match!') end -delete('example.mat'); \ No newline at end of file +delete('example1.mat'); \ No newline at end of file diff --git a/tests/pac/trend-component-15/clean b/tests/pac/trend-component-15/clean index cf3492a2882bd7f04ed0112d888b5031b10016c9..64aaf88ee19814d682abb13fd20a55004afabaf9 100755 --- a/tests/pac/trend-component-15/clean +++ b/tests/pac/trend-component-15/clean @@ -1,8 +1,8 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm -f *.m rm -f *.dat diff --git a/tests/pac/trend-component-15/example.mod b/tests/pac/trend-component-15/example1.mod similarity index 100% rename from tests/pac/trend-component-15/example.mod rename to tests/pac/trend-component-15/example1.mod diff --git a/tests/pac/trend-component-16/clean b/tests/pac/trend-component-16/clean index cf3492a2882bd7f04ed0112d888b5031b10016c9..64aaf88ee19814d682abb13fd20a55004afabaf9 100755 --- a/tests/pac/trend-component-16/clean +++ b/tests/pac/trend-component-16/clean @@ -1,8 +1,8 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm -f *.m rm -f *.dat diff --git a/tests/pac/trend-component-16/example.mod b/tests/pac/trend-component-16/example1.mod similarity index 100% rename from tests/pac/trend-component-16/example.mod rename to tests/pac/trend-component-16/example1.mod diff --git a/tests/pac/trend-component-17/clean b/tests/pac/trend-component-17/clean index cf3492a2882bd7f04ed0112d888b5031b10016c9..64aaf88ee19814d682abb13fd20a55004afabaf9 100755 --- a/tests/pac/trend-component-17/clean +++ b/tests/pac/trend-component-17/clean @@ -1,8 +1,8 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm -f *.m rm -f *.dat diff --git a/tests/pac/trend-component-17/example.mod b/tests/pac/trend-component-17/example1.mod similarity index 100% rename from tests/pac/trend-component-17/example.mod rename to tests/pac/trend-component-17/example1.mod diff --git a/tests/pac/trend-component-18/clean b/tests/pac/trend-component-18/clean index cf3492a2882bd7f04ed0112d888b5031b10016c9..64aaf88ee19814d682abb13fd20a55004afabaf9 100755 --- a/tests/pac/trend-component-18/clean +++ b/tests/pac/trend-component-18/clean @@ -1,8 +1,8 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm -f *.m rm -f *.dat diff --git a/tests/pac/trend-component-18/example.mod b/tests/pac/trend-component-18/example1.mod similarity index 100% rename from tests/pac/trend-component-18/example.mod rename to tests/pac/trend-component-18/example1.mod diff --git a/tests/pac/trend-component-19-growth-lin-comb/clean b/tests/pac/trend-component-19-growth-lin-comb/clean index c0a4ee970df4ea508d4ad14942bbda3bdd820e51..be45cd0a25ee53fbfc4638b1c06e74fa6e4bc978 100644 --- a/tests/pac/trend-component-19-growth-lin-comb/clean +++ b/tests/pac/trend-component-19-growth-lin-comb/clean @@ -1,8 +1,8 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm -f *.m rm -f *.dat \ No newline at end of file diff --git a/tests/pac/trend-component-19-growth-lin-comb/example.mod b/tests/pac/trend-component-19-growth-lin-comb/example1.mod similarity index 100% rename from tests/pac/trend-component-19-growth-lin-comb/example.mod rename to tests/pac/trend-component-19-growth-lin-comb/example1.mod diff --git a/tests/pac/trend-component-2/clean b/tests/pac/trend-component-2/clean index be0d5e00cdb49fa48f99aa6470ff0578973bbce3..84ef9f4e31471cba80a068c838ce27ee2d98a265 100755 --- a/tests/pac/trend-component-2/clean +++ b/tests/pac/trend-component-2/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example*.mat -rm -f example.log \ No newline at end of file +rm -rf example1 +rm -rf +example1 +rm -f example1*.mat +rm -f example1.log \ No newline at end of file diff --git a/tests/pac/trend-component-2/example.mod b/tests/pac/trend-component-2/example1.mod similarity index 100% rename from tests/pac/trend-component-2/example.mod rename to tests/pac/trend-component-2/example1.mod diff --git a/tests/pac/trend-component-20-1/clean b/tests/pac/trend-component-20-1/clean index cf3492a2882bd7f04ed0112d888b5031b10016c9..64aaf88ee19814d682abb13fd20a55004afabaf9 100755 --- a/tests/pac/trend-component-20-1/clean +++ b/tests/pac/trend-component-20-1/clean @@ -1,8 +1,8 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm -f *.m rm -f *.dat diff --git a/tests/pac/trend-component-20-1/example.mod b/tests/pac/trend-component-20-1/example1.mod similarity index 100% rename from tests/pac/trend-component-20-1/example.mod rename to tests/pac/trend-component-20-1/example1.mod diff --git a/tests/pac/trend-component-20-2/clean b/tests/pac/trend-component-20-2/clean index cf3492a2882bd7f04ed0112d888b5031b10016c9..64aaf88ee19814d682abb13fd20a55004afabaf9 100755 --- a/tests/pac/trend-component-20-2/clean +++ b/tests/pac/trend-component-20-2/clean @@ -1,8 +1,8 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm -f *.m rm -f *.dat diff --git a/tests/pac/trend-component-20-2/example.mod b/tests/pac/trend-component-20-2/example1.mod similarity index 100% rename from tests/pac/trend-component-20-2/example.mod rename to tests/pac/trend-component-20-2/example1.mod diff --git a/tests/pac/trend-component-20-3/clean b/tests/pac/trend-component-20-3/clean index cf3492a2882bd7f04ed0112d888b5031b10016c9..64aaf88ee19814d682abb13fd20a55004afabaf9 100755 --- a/tests/pac/trend-component-20-3/clean +++ b/tests/pac/trend-component-20-3/clean @@ -1,8 +1,8 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm -f *.m rm -f *.dat diff --git a/tests/pac/trend-component-20-3/example.mod b/tests/pac/trend-component-20-3/example1.mod similarity index 100% rename from tests/pac/trend-component-20-3/example.mod rename to tests/pac/trend-component-20-3/example1.mod diff --git a/tests/pac/trend-component-20-4/clean b/tests/pac/trend-component-20-4/clean index cf3492a2882bd7f04ed0112d888b5031b10016c9..64aaf88ee19814d682abb13fd20a55004afabaf9 100755 --- a/tests/pac/trend-component-20-4/clean +++ b/tests/pac/trend-component-20-4/clean @@ -1,8 +1,8 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm -f *.m rm -f *.dat diff --git a/tests/pac/trend-component-20-4/example.mod b/tests/pac/trend-component-20-4/example1.mod similarity index 100% rename from tests/pac/trend-component-20-4/example.mod rename to tests/pac/trend-component-20-4/example1.mod diff --git a/tests/pac/trend-component-21/clean b/tests/pac/trend-component-21/clean index cf3492a2882bd7f04ed0112d888b5031b10016c9..64aaf88ee19814d682abb13fd20a55004afabaf9 100755 --- a/tests/pac/trend-component-21/clean +++ b/tests/pac/trend-component-21/clean @@ -1,8 +1,8 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm -f *.m rm -f *.dat diff --git a/tests/pac/trend-component-21/example.mod b/tests/pac/trend-component-21/example1.mod similarity index 100% rename from tests/pac/trend-component-21/example.mod rename to tests/pac/trend-component-21/example1.mod diff --git a/tests/pac/trend-component-22/clean b/tests/pac/trend-component-22/clean index cf3492a2882bd7f04ed0112d888b5031b10016c9..64aaf88ee19814d682abb13fd20a55004afabaf9 100755 --- a/tests/pac/trend-component-22/clean +++ b/tests/pac/trend-component-22/clean @@ -1,8 +1,8 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm -f *.m rm -f *.dat diff --git a/tests/pac/trend-component-22/example.mod b/tests/pac/trend-component-22/example1.mod similarity index 100% rename from tests/pac/trend-component-22/example.mod rename to tests/pac/trend-component-22/example1.mod diff --git a/tests/pac/trend-component-23/clean b/tests/pac/trend-component-23/clean index cf3492a2882bd7f04ed0112d888b5031b10016c9..64aaf88ee19814d682abb13fd20a55004afabaf9 100755 --- a/tests/pac/trend-component-23/clean +++ b/tests/pac/trend-component-23/clean @@ -1,8 +1,8 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm -f *.m rm -f *.dat diff --git a/tests/pac/trend-component-23/example.mod b/tests/pac/trend-component-23/example1.mod similarity index 100% rename from tests/pac/trend-component-23/example.mod rename to tests/pac/trend-component-23/example1.mod diff --git a/tests/pac/trend-component-24/clean b/tests/pac/trend-component-24/clean index cf3492a2882bd7f04ed0112d888b5031b10016c9..64aaf88ee19814d682abb13fd20a55004afabaf9 100755 --- a/tests/pac/trend-component-24/clean +++ b/tests/pac/trend-component-24/clean @@ -1,8 +1,8 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm -f *.m rm -f *.dat diff --git a/tests/pac/trend-component-24/example.mod b/tests/pac/trend-component-24/example1.mod similarity index 100% rename from tests/pac/trend-component-24/example.mod rename to tests/pac/trend-component-24/example1.mod diff --git a/tests/pac/trend-component-25/clean b/tests/pac/trend-component-25/clean index cf3492a2882bd7f04ed0112d888b5031b10016c9..64aaf88ee19814d682abb13fd20a55004afabaf9 100755 --- a/tests/pac/trend-component-25/clean +++ b/tests/pac/trend-component-25/clean @@ -1,8 +1,8 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm -f *.m rm -f *.dat diff --git a/tests/pac/trend-component-25/example.mod b/tests/pac/trend-component-25/example1.mod similarity index 100% rename from tests/pac/trend-component-25/example.mod rename to tests/pac/trend-component-25/example1.mod diff --git a/tests/pac/trend-component-26/clean b/tests/pac/trend-component-26/clean index cf3492a2882bd7f04ed0112d888b5031b10016c9..64aaf88ee19814d682abb13fd20a55004afabaf9 100755 --- a/tests/pac/trend-component-26/clean +++ b/tests/pac/trend-component-26/clean @@ -1,8 +1,8 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm -f *.m rm -f *.dat diff --git a/tests/pac/trend-component-26/example.mod b/tests/pac/trend-component-26/example1.mod similarity index 100% rename from tests/pac/trend-component-26/example.mod rename to tests/pac/trend-component-26/example1.mod diff --git a/tests/pac/trend-component-27/clean b/tests/pac/trend-component-27/clean index cf3492a2882bd7f04ed0112d888b5031b10016c9..64aaf88ee19814d682abb13fd20a55004afabaf9 100755 --- a/tests/pac/trend-component-27/clean +++ b/tests/pac/trend-component-27/clean @@ -1,8 +1,8 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm -f *.m rm -f *.dat diff --git a/tests/pac/trend-component-27/example.mod b/tests/pac/trend-component-27/example1.mod similarity index 96% rename from tests/pac/trend-component-27/example.mod rename to tests/pac/trend-component-27/example1.mod index 269d12e1dae02d9b0e8743a5e747095681636601..2445a35ad6c33ea6c4f517e09ebc48df667697cf 100644 --- a/tests/pac/trend-component-27/example.mod +++ b/tests/pac/trend-component-27/example1.mod @@ -112,4 +112,4 @@ pac.update.expectation('pacman'); // Select a subset of the equations and print the equations, the list of parameters, endogenous // variables and exogenous variables in .inc files under ./simulation-files folder. Note that // innovations ex1bar and ex2bar will not appear in the equations. -cherrypick('example', 'simulation-files', {'zpac', 'eq:x1', 'eq:x2', 'eq:x1bar', 'eq:x2bar'}, true); \ No newline at end of file +cherrypick('example1', 'simulation-files', {'zpac', 'eq:x1', 'eq:x2', 'eq:x1bar', 'eq:x2bar'}, true); diff --git a/tests/pac/trend-component-3/clean b/tests/pac/trend-component-3/clean index 2935a38ad605cee3810c18217e54906355524374..13f5ef3a4f3ecf4f4d34da2519598624231ff981 100755 --- a/tests/pac/trend-component-3/clean +++ b/tests/pac/trend-component-3/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example*.mat -rm -f example.log \ No newline at end of file +rm -rf example1 +rm -rf +example1 +rm -f example1*.mat +rm -f example1.log \ No newline at end of file diff --git a/tests/pac/trend-component-3/example.mod b/tests/pac/trend-component-3/example1.mod similarity index 100% rename from tests/pac/trend-component-3/example.mod rename to tests/pac/trend-component-3/example1.mod diff --git a/tests/pac/trend-component-30/clean b/tests/pac/trend-component-30/clean index be0d5e00cdb49fa48f99aa6470ff0578973bbce3..84ef9f4e31471cba80a068c838ce27ee2d98a265 100755 --- a/tests/pac/trend-component-30/clean +++ b/tests/pac/trend-component-30/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example*.mat -rm -f example.log \ No newline at end of file +rm -rf example1 +rm -rf +example1 +rm -f example1*.mat +rm -f example1.log \ No newline at end of file diff --git a/tests/pac/trend-component-30/example.mod b/tests/pac/trend-component-30/example1.mod similarity index 100% rename from tests/pac/trend-component-30/example.mod rename to tests/pac/trend-component-30/example1.mod diff --git a/tests/pac/trend-component-31/clean b/tests/pac/trend-component-31/clean index be0d5e00cdb49fa48f99aa6470ff0578973bbce3..84ef9f4e31471cba80a068c838ce27ee2d98a265 100755 --- a/tests/pac/trend-component-31/clean +++ b/tests/pac/trend-component-31/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example*.mat -rm -f example.log \ No newline at end of file +rm -rf example1 +rm -rf +example1 +rm -f example1*.mat +rm -f example1.log \ No newline at end of file diff --git a/tests/pac/trend-component-31/example.mod b/tests/pac/trend-component-31/example1.mod similarity index 100% rename from tests/pac/trend-component-31/example.mod rename to tests/pac/trend-component-31/example1.mod diff --git a/tests/pac/trend-component-4/clean b/tests/pac/trend-component-4/clean index 2935a38ad605cee3810c18217e54906355524374..13f5ef3a4f3ecf4f4d34da2519598624231ff981 100755 --- a/tests/pac/trend-component-4/clean +++ b/tests/pac/trend-component-4/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example*.mat -rm -f example.log \ No newline at end of file +rm -rf example1 +rm -rf +example1 +rm -f example1*.mat +rm -f example1.log \ No newline at end of file diff --git a/tests/pac/trend-component-4/example.mod b/tests/pac/trend-component-4/example1.mod similarity index 100% rename from tests/pac/trend-component-4/example.mod rename to tests/pac/trend-component-4/example1.mod diff --git a/tests/pac/trend-component-5/clean b/tests/pac/trend-component-5/clean index 2935a38ad605cee3810c18217e54906355524374..13f5ef3a4f3ecf4f4d34da2519598624231ff981 100755 --- a/tests/pac/trend-component-5/clean +++ b/tests/pac/trend-component-5/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example*.mat -rm -f example.log \ No newline at end of file +rm -rf example1 +rm -rf +example1 +rm -f example1*.mat +rm -f example1.log \ No newline at end of file diff --git a/tests/pac/trend-component-5/example.mod b/tests/pac/trend-component-5/example1.mod similarity index 100% rename from tests/pac/trend-component-5/example.mod rename to tests/pac/trend-component-5/example1.mod diff --git a/tests/pac/trend-component-6/clean b/tests/pac/trend-component-6/clean index 0d64aefdef6d2368cc070b20e575ca5e6ce127f4..682ff02d923bb8a37d2ffe9758f1c207efc74f66 100755 --- a/tests/pac/trend-component-6/clean +++ b/tests/pac/trend-component-6/clean @@ -1,7 +1,7 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm *.m diff --git a/tests/pac/trend-component-6/example.mod b/tests/pac/trend-component-6/example1.mod similarity index 100% rename from tests/pac/trend-component-6/example.mod rename to tests/pac/trend-component-6/example1.mod diff --git a/tests/pac/trend-component-7/clean b/tests/pac/trend-component-7/clean index 6f2442c33a30d840d93824c6a73ea4329314c774..df0cbbcdcf94eae7ba7f4a4efc410e728e8fe9eb 100755 --- a/tests/pac/trend-component-7/clean +++ b/tests/pac/trend-component-7/clean @@ -1,7 +1,7 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example*.mat -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1*.mat +rm -f example1.log rm -f *.m \ No newline at end of file diff --git a/tests/pac/trend-component-7/example.mod b/tests/pac/trend-component-7/example1.mod similarity index 100% rename from tests/pac/trend-component-7/example.mod rename to tests/pac/trend-component-7/example1.mod diff --git a/tests/pac/trend-component-8-mc-iterative-ols/clean b/tests/pac/trend-component-8-mc-iterative-ols/clean index bdc7da19ab956a4a155e5fc8cbdf9a11ebbebff0..3c173825b16372789b880a499b8c235a1d8eba51 100755 --- a/tests/pac/trend-component-8-mc-iterative-ols/clean +++ b/tests/pac/trend-component-8-mc-iterative-ols/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat \ No newline at end of file diff --git a/tests/pac/trend-component-8-mc-iterative-ols/example.mod b/tests/pac/trend-component-8-mc-iterative-ols/example1.mod similarity index 100% rename from tests/pac/trend-component-8-mc-iterative-ols/example.mod rename to tests/pac/trend-component-8-mc-iterative-ols/example1.mod diff --git a/tests/pac/trend-component-8-mc-nls/clean b/tests/pac/trend-component-8-mc-nls/clean index 0d64aefdef6d2368cc070b20e575ca5e6ce127f4..682ff02d923bb8a37d2ffe9758f1c207efc74f66 100755 --- a/tests/pac/trend-component-8-mc-nls/clean +++ b/tests/pac/trend-component-8-mc-nls/clean @@ -1,7 +1,7 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat rm *.m diff --git a/tests/pac/trend-component-8-mc-nls/example.mod b/tests/pac/trend-component-8-mc-nls/example1.mod similarity index 100% rename from tests/pac/trend-component-8-mc-nls/example.mod rename to tests/pac/trend-component-8-mc-nls/example1.mod diff --git a/tests/pac/trend-component-9/clean b/tests/pac/trend-component-9/clean index bdc7da19ab956a4a155e5fc8cbdf9a11ebbebff0..3c173825b16372789b880a499b8c235a1d8eba51 100755 --- a/tests/pac/trend-component-9/clean +++ b/tests/pac/trend-component-9/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1.log rm -f *.mat \ No newline at end of file diff --git a/tests/pac/trend-component-9/example.mod b/tests/pac/trend-component-9/example1.mod similarity index 100% rename from tests/pac/trend-component-9/example.mod rename to tests/pac/trend-component-9/example1.mod diff --git a/tests/pac/var-1/clean b/tests/pac/var-1/clean index be0d5e00cdb49fa48f99aa6470ff0578973bbce3..52b080ef81f90bc69acfa52c0d076a0bb24289a0 100755 --- a/tests/pac/var-1/clean +++ b/tests/pac/var-1/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example*.mat -rm -f example.log \ No newline at end of file +rm -rf example1 +rm -rf +example1 +rm -f example1*.mat +rm -f example1.log diff --git a/tests/pac/var-1/example.mod b/tests/pac/var-1/example1.mod similarity index 100% rename from tests/pac/var-1/example.mod rename to tests/pac/var-1/example1.mod diff --git a/tests/pac/var-2/clean b/tests/pac/var-2/clean index be0d5e00cdb49fa48f99aa6470ff0578973bbce3..52b080ef81f90bc69acfa52c0d076a0bb24289a0 100755 --- a/tests/pac/var-2/clean +++ b/tests/pac/var-2/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example*.mat -rm -f example.log \ No newline at end of file +rm -rf example1 +rm -rf +example1 +rm -f example1*.mat +rm -f example1.log diff --git a/tests/pac/var-2/example.mod b/tests/pac/var-2/example1.mod similarity index 100% rename from tests/pac/var-2/example.mod rename to tests/pac/var-2/example1.mod diff --git a/tests/pac/var-3/clean b/tests/pac/var-3/clean index be0d5e00cdb49fa48f99aa6470ff0578973bbce3..52b080ef81f90bc69acfa52c0d076a0bb24289a0 100755 --- a/tests/pac/var-3/clean +++ b/tests/pac/var-3/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example*.mat -rm -f example.log \ No newline at end of file +rm -rf example1 +rm -rf +example1 +rm -f example1*.mat +rm -f example1.log diff --git a/tests/pac/var-3/example.mod b/tests/pac/var-3/example1.mod similarity index 100% rename from tests/pac/var-3/example.mod rename to tests/pac/var-3/example1.mod diff --git a/tests/pac/var-4/clean b/tests/pac/var-4/clean index be0d5e00cdb49fa48f99aa6470ff0578973bbce3..52b080ef81f90bc69acfa52c0d076a0bb24289a0 100755 --- a/tests/pac/var-4/clean +++ b/tests/pac/var-4/clean @@ -1,6 +1,6 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example*.mat -rm -f example.log \ No newline at end of file +rm -rf example1 +rm -rf +example1 +rm -f example1*.mat +rm -f example1.log diff --git a/tests/pac/var-4/example.mod b/tests/pac/var-4/example1.mod similarity index 100% rename from tests/pac/var-4/example.mod rename to tests/pac/var-4/example1.mod diff --git a/tests/pac/var-5/clean b/tests/pac/var-5/clean index 20de477e3c9a5d9c2bf28cd2ebc98d5cffec4523..1c4fb0aabae933117b83a91b19af9377c8174a29 100755 --- a/tests/pac/var-5/clean +++ b/tests/pac/var-5/clean @@ -1,9 +1,9 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example*.mat -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1*.mat +rm -f example1.log rm -rf substitution rm -rf +substitution rm -f substitution*.mat diff --git a/tests/pac/var-5/example.mod b/tests/pac/var-5/example1.mod similarity index 90% rename from tests/pac/var-5/example.mod rename to tests/pac/var-5/example1.mod index 1368f3fb2427d280e8029acc1045954fe0f72c89..779045887d9dbc1954d90d70af445a575698ea66 100644 --- a/tests/pac/var-5/example.mod +++ b/tests/pac/var-5/example1.mod @@ -66,8 +66,8 @@ verbatim; y = zeros(M_.endo_nbr,1); y(1:M_.orig_endo_nbr) = rand(M_.orig_endo_nbr, 1); x = randn(M_.exo_nbr,1); - y = example.set_auxiliary_variables(y, x, M_.params); + y = example1.set_auxiliary_variables(y, x, M_.params); y = [y(find(M_.lead_lag_incidence(1,:))); y]; - [residual, g1] = example.dynamic(y, x', M_.params, oo_.steady_state, 1); - save('example.mat', 'residual', 'g1', 'TrueData'); + [residual, g1] = example1.dynamic(y, x', M_.params, oo_.steady_state, 1); + save('example1.mat', 'residual', 'g1', 'TrueData'); end; diff --git a/tests/pac/var-5/substitution.mod b/tests/pac/var-5/substitution.mod index 41ae58da39a7597ed2548729ae5e77bc019db643..8c2924b8f7c738b9dc2c055475e8d99f71eafaac 100644 --- a/tests/pac/var-5/substitution.mod +++ b/tests/pac/var-5/substitution.mod @@ -21,7 +21,7 @@ e_c_m = .1; c_z_1 = .7; c_z_2 = -.3; -@#include "example/model/pac-expectations/eq0-pacman-parameters.inc" +@#include "example1/model/pac-expectations/eq0-pacman-parameters.inc" model; @@ -33,9 +33,9 @@ diff(x) = b_x_1*y(-2) + b_x_2*diff(x(-1)) + g*(1-b_x_2) + ex ; [name='eq:pac'] diff(z) = e_c_m*(x(-1)-z(-1)) + c_z_1*diff(z(-1)) + c_z_2*diff(z(-2)) + -@#include "example/model/pac-expectations/eq0-pacman-growth-neutrality-correction.inc" +@#include "example1/model/pac-expectations/eq0-pacman-growth-neutrality-correction.inc" + -@#include "example/model/pac-expectations/eq0-pacman-expression.inc" +@#include "example1/model/pac-expectations/eq0-pacman-expression.inc" + ez; end; @@ -60,20 +60,20 @@ verbatim; x = randn(M_.exo_nbr,1); y = substitution.set_auxiliary_variables(y, x, M_.params); y = [y(find(M_.lead_lag_incidence(1,:))); y]; - example = load('example.mat'); + example1 = load('example1.mat'); [residual, g1] = substitution.dynamic(y, x', M_.params, oo_.steady_state, 1); end; -if max(abs(example.TrueData.data(:)-TrueData.data(:)))>1e-9 +if max(abs(example1.TrueData.data(:)-TrueData.data(:)))>1e-9 error('Simulations do not match.') end -if ~isequal(length(residual), length(example.residual)) || max(abs(example.residual-residual))>1e-8 +if ~isequal(length(residual), length(example1.residual)) || max(abs(example1.residual-residual))>1e-8 warning('Residuals do not match!') end -if ~isequal(length(g1(:)), length(example.g1(:))) || max(abs(example.g1(:)-g1(:)))>1e-8 +if ~isequal(length(g1(:)), length(example1.g1(:))) || max(abs(example1.g1(:)-g1(:)))>1e-8 warning('Jacobian matrices do not match!') end -delete('example.mat'); \ No newline at end of file +delete('example1.mat'); diff --git a/tests/pac/var-6/clean b/tests/pac/var-6/clean index 20de477e3c9a5d9c2bf28cd2ebc98d5cffec4523..1c4fb0aabae933117b83a91b19af9377c8174a29 100755 --- a/tests/pac/var-6/clean +++ b/tests/pac/var-6/clean @@ -1,9 +1,9 @@ #!/bin/sh -rm -rf example -rm -rf +example -rm -f example*.mat -rm -f example.log +rm -rf example1 +rm -rf +example1 +rm -f example1*.mat +rm -f example1.log rm -rf substitution rm -rf +substitution rm -f substitution*.mat diff --git a/tests/pac/var-6/example.mod b/tests/pac/var-6/example1.mod similarity index 90% rename from tests/pac/var-6/example.mod rename to tests/pac/var-6/example1.mod index f2e94f5175261d5db4c137da910c08c3a26494bf..58a5b08fc4f23b9a8b3a261167b76dbea9b50438 100644 --- a/tests/pac/var-6/example.mod +++ b/tests/pac/var-6/example1.mod @@ -70,8 +70,8 @@ verbatim; y = zeros(M_.endo_nbr,1); y(1:M_.orig_endo_nbr) = rand(M_.orig_endo_nbr, 1); x = randn(M_.exo_nbr,1); - y = example.set_auxiliary_variables(y, x, M_.params); + y = example1.set_auxiliary_variables(y, x, M_.params); y = [y(find(M_.lead_lag_incidence(1,:))); y]; - [residual, g1] = example.dynamic(y, x', M_.params, oo_.steady_state, 1); - save('example.mat', 'residual', 'g1', 'TrueData'); + [residual, g1] = example1.dynamic(y, x', M_.params, oo_.steady_state, 1); + save('example1.mat', 'residual', 'g1', 'TrueData'); end; diff --git a/tests/pac/var-6/substitution.mod b/tests/pac/var-6/substitution.mod index f412bf6556709587ad549f7c74b84df453a7b084..13978e8023ac43e745d3bdad9a23cea97029152c 100644 --- a/tests/pac/var-6/substitution.mod +++ b/tests/pac/var-6/substitution.mod @@ -21,7 +21,7 @@ e_c_m = .1; c_z_1 = .7; c_z_2 = -.3; -@#include "example/model/pac-expectations/eq0-pacman-parameters.inc" +@#include "example1/model/pac-expectations/eq0-pacman-parameters.inc" model; @@ -36,9 +36,9 @@ model; [name='eq:pac'] diff(z) = e_c_m*(x(-1)-z(-1)) + c_z_1*diff(z(-1)) + c_z_2*diff(z(-2)) + - @#include "example/model/pac-expectations/eq0-pacman-growth-neutrality-correction.inc" + @#include "example1/model/pac-expectations/eq0-pacman-growth-neutrality-correction.inc" + - @#include "example/model/pac-expectations/eq0-pacman-expression.inc" + @#include "example1/model/pac-expectations/eq0-pacman-expression.inc" + ez; end; @@ -65,21 +65,21 @@ verbatim; x = randn(M_.exo_nbr,1); y = substitution.set_auxiliary_variables(y, x, M_.params); y = [y(find(M_.lead_lag_incidence(1,:))); y]; - example = load('example.mat'); + example1 = load('example1.mat'); [residual, g1] = substitution.dynamic(y, x', M_.params, oo_.steady_state, 1); - if max(abs(example.TrueData.data(:)-TrueData.data(:)))>1e-9 + if max(abs(example1.TrueData.data(:)-TrueData.data(:)))>1e-9 error('Simulations do not match.') end - if ~isequal(length(residual), length(example.residual)) || max(abs(example.residual-residual))>1e-8 + if ~isequal(length(residual), length(example1.residual)) || max(abs(example1.residual-residual))>1e-8 warning('Residuals do not match!') end - if ~isequal(length(g1(:)), length(example.g1(:))) || max(abs(example.g1(:)-g1(:)))>1e-8 + if ~isequal(length(g1(:)), length(example1.g1(:))) || max(abs(example1.g1(:)-g1(:)))>1e-8 warning('Jacobian matrices do not match!') end - delete('example.mat'); + delete('example1.mat'); end; diff --git a/tests/var-expectations/1/example.mod b/tests/var-expectations/1/example1.mod similarity index 100% rename from tests/var-expectations/1/example.mod rename to tests/var-expectations/1/example1.mod diff --git a/tests/var-expectations/10/example.mod b/tests/var-expectations/10/example1.mod similarity index 96% rename from tests/var-expectations/10/example.mod rename to tests/var-expectations/10/example1.mod index 7b1542ee9e4e685d452e698e35aaa4425f2a540f..4a0068671d7e55511cb2880ae7cd8c4222e5539e 100644 --- a/tests/var-expectations/10/example.mod +++ b/tests/var-expectations/10/example1.mod @@ -60,7 +60,7 @@ verbatim; ts = simul_backward_model(initialconditions, 15); foo = ts.foo.data; % Evaluate the (VAR) expectation term - ts{'toto'} = example.var_expectations.varexp.evaluate(ts); + ts{'toto'} = example1.var_expectations.varexp.evaluate(ts); % Check tthat the evaluation is correct. range = dates('2000Q4'):dates('2004Q2'); if max(abs(ts(range).foo.data-ts(range).toto.data))>1e-5 diff --git a/tests/var-expectations/2/example.mod b/tests/var-expectations/2/example1.mod similarity index 100% rename from tests/var-expectations/2/example.mod rename to tests/var-expectations/2/example1.mod diff --git a/tests/var-expectations/3/example.mod b/tests/var-expectations/3/example1.mod similarity index 100% rename from tests/var-expectations/3/example.mod rename to tests/var-expectations/3/example1.mod diff --git a/tests/var-expectations/4/example.mod b/tests/var-expectations/4/example1.mod similarity index 100% rename from tests/var-expectations/4/example.mod rename to tests/var-expectations/4/example1.mod diff --git a/tests/var-expectations/5/example.mod b/tests/var-expectations/5/example1.mod similarity index 100% rename from tests/var-expectations/5/example.mod rename to tests/var-expectations/5/example1.mod diff --git a/tests/var-expectations/6/example.mod b/tests/var-expectations/6/example1.mod similarity index 99% rename from tests/var-expectations/6/example.mod rename to tests/var-expectations/6/example1.mod index 65ba9eff672029197794f68b954502f61eb3023b..df8fbd07a3bbcfe44285048dd97a32bc651618ba 100644 --- a/tests/var-expectations/6/example.mod +++ b/tests/var-expectations/6/example1.mod @@ -105,5 +105,5 @@ verbatim; set_dynare_seed('default'); ts = simul_backward_model(initialconditions, 100); foo = ts.foo.data; - save('example.mat', 'foo'); + save('example1.mat', 'foo'); end; \ No newline at end of file diff --git a/tests/var-expectations/6/substitution.mod b/tests/var-expectations/6/substitution.mod index 6deae093febd06fa236eda9e37f6144942095710..fb93efbf2f4043cd5103c1b01b438c71f573a5ef 100644 --- a/tests/var-expectations/6/substitution.mod +++ b/tests/var-expectations/6/substitution.mod @@ -22,7 +22,7 @@ a_x2_2 = -.1; a_x2_x1_1 = -.1; a_x2_x1_2 = .2; -@#include "example/model/var-expectations/varexp-parameters.inc" +@#include "example1/model/var-expectations/varexp-parameters.inc" beta = 1/(1+.02); @@ -41,7 +41,7 @@ x1bar = x1bar(-1) + ex1bar; x2bar = x2bar(-1) + ex2bar; foo = .5*foo(-1) + -@#include "example/model/var-expectations/varexp-expression.inc" +@#include "example1/model/var-expectations/varexp-expression.inc" ; end; @@ -68,8 +68,8 @@ verbatim; dseries(initialconditions, dates('2000Q1'), {'foo', 'x1','x2', 'x1bar', 'x2bar'}); set_dynare_seed('default'); ts = simul_backward_model(initialconditions, 100); - ex = load('example.mat'); - delete('example.mat') + ex = load('example1.mat'); + delete('example1.mat') if max(abs(ex.foo-ts.foo.data))>1e-12 error('Simulations do not match!') end diff --git a/tests/var-expectations/7/example.mod b/tests/var-expectations/7/example1.mod similarity index 98% rename from tests/var-expectations/7/example.mod rename to tests/var-expectations/7/example1.mod index 4aa7b4374c32a2475e2235a84c406624fe61c36b..b6f9f09ce72e2a2077fe2157f1a339c09b15e16f 100644 --- a/tests/var-expectations/7/example.mod +++ b/tests/var-expectations/7/example1.mod @@ -61,5 +61,5 @@ verbatim; set_dynare_seed('default'); ts = simul_backward_model(initialconditions, 100); foo = ts.foo.data; - save('example.mat', 'foo'); + save('example1.mat', 'foo'); end; diff --git a/tests/var-expectations/7/substitution.mod b/tests/var-expectations/7/substitution.mod index 2cfb853f9b046a7536409840dd6332e7fef4f1b2..7149162ee185d30c774f023a83ca2eadf91775aa 100644 --- a/tests/var-expectations/7/substitution.mod +++ b/tests/var-expectations/7/substitution.mod @@ -11,7 +11,7 @@ f = .8; d = .5; e = .4; -@#include "example/model/var-expectations/varexp-parameters.inc" +@#include "example1/model/var-expectations/varexp-parameters.inc" beta = 1/(1+.02); @@ -27,7 +27,7 @@ z = f*z(-1) + e_z; log(y) = d*log(y(-2)) + e*z(-1) + e_y; foo = .5*foo(-1) + -@#include "example/model/var-expectations/varexp-expression.inc" +@#include "example1/model/var-expectations/varexp-expression.inc" ; end; @@ -50,10 +50,10 @@ verbatim; dseries(initialconditions, dates('2000Q1'), {'foo', 'y','z', 'x'}); set_dynare_seed('default'); ts = simul_backward_model(initialconditions, 100); - ex = load('example.mat'); + ex = load('example1.mat'); end; -delete('example.mat') +delete('example1.mat') if max(abs(ex.foo-ts.foo.data))>1e-12 error('Simulations do not match!') diff --git a/tests/var-expectations/8/example.mod b/tests/var-expectations/8/example1.mod similarity index 98% rename from tests/var-expectations/8/example.mod rename to tests/var-expectations/8/example1.mod index cc14a3e9e45d08adf272cacf0294a3a34beabe2a..5d64fee5342f859fbb432355d439957b42a7c6ae 100644 --- a/tests/var-expectations/8/example.mod +++ b/tests/var-expectations/8/example1.mod @@ -59,5 +59,5 @@ verbatim; set_dynare_seed('default'); ts = simul_backward_model(initialconditions, 100); foo = ts.foo.data; - save('example.mat', 'foo'); + save('example1.mat', 'foo'); end; \ No newline at end of file diff --git a/tests/var-expectations/8/substitution.mod b/tests/var-expectations/8/substitution.mod index 96b9bbb61732163662782f3f8ea6e8067962d410..aad780174cfa2551b88825de08e32ab5ae659d60 100644 --- a/tests/var-expectations/8/substitution.mod +++ b/tests/var-expectations/8/substitution.mod @@ -11,7 +11,7 @@ f = .8; d = .5; e = .4; -@#include "example/model/var-expectations/varexp-parameters.inc" +@#include "example1/model/var-expectations/varexp-parameters.inc" beta = 1/(1+.02); @@ -24,7 +24,7 @@ diff(z) = f*diff(z(-1)) + e_z; log(y) = d*log(y(-2)) + e*diff(z(-1)) + e_y; foo = .5*foo(-1) + -@#include "example/model/var-expectations/varexp-expression.inc" +@#include "example1/model/var-expectations/varexp-expression.inc" ; end; @@ -47,10 +47,10 @@ verbatim; dseries(initialconditions, dates('2000Q1'), {'foo', 'y','z', 'x'}); set_dynare_seed('default'); ts = simul_backward_model(initialconditions, 100); - ex = load('example.mat'); + ex = load('example1.mat'); end; -delete('example.mat') +delete('example1.mat') if max(abs(ex.foo-ts.foo.data))>1e-12 error('Simulations do not match!') diff --git a/tests/var-expectations/9/example.mod b/tests/var-expectations/9/example1.mod similarity index 100% rename from tests/var-expectations/9/example.mod rename to tests/var-expectations/9/example1.mod