diff --git a/preprocessor b/preprocessor index ca375041bb0860341aef5df1487413576973c092..150e9f05d5b164b728800ed9592d75071c765fb4 160000 --- a/preprocessor +++ b/preprocessor @@ -1 +1 @@ -Subproject commit ca375041bb0860341aef5df1487413576973c092 +Subproject commit 150e9f05d5b164b728800ed9592d75071c765fb4 diff --git a/tests/pac/trend-component-13a/example.mod b/tests/pac/trend-component-13a/example.mod index da102a915ed68faca2e5c943d557f5f3772d316f..0ae12e910379a46e326a80c5a69f95b930b64ed2 100644 --- a/tests/pac/trend-component-13a/example.mod +++ b/tests/pac/trend-component-13a/example.mod @@ -69,6 +69,6 @@ end; // Initialize the PAC model (build the Companion VAR representation for the auxiliary model). pac.initialize('pacman'); -if ~isequal(M_.pac.pacman.equations.(M_.pac.pacman.tag_map{strcmp(M_.pac.pacman.tag_map(:,1), 'zpac'),2}).ec.istarget, [true, false]) +if ~isequal(M_.pac.pacman.equations.(M_.pac.pacman.tag_map{strcmp(M_.pac.pacman.tag_map(:,1), 'zpac'),2}).ec.istarget, [false, true]) error('ec.istarget vector is wrong.') end diff --git a/tests/pac/trend-component-13b/example.mod b/tests/pac/trend-component-13b/example.mod index 49d275bb598c7f801613e0a05a9b4f301df821dc..da102a915ed68faca2e5c943d557f5f3772d316f 100644 --- a/tests/pac/trend-component-13b/example.mod +++ b/tests/pac/trend-component-13b/example.mod @@ -52,7 +52,7 @@ x1bar = x1bar(-1) + ex1bar; x2bar = x2bar(-1) + ex2bar; [name='zpac'] -diff(z) = e_c_m*(z(-1)-x1(-1)) + c_z_1*diff(z(-1)) + c_z_2*diff(z(-2)) + pac_expectation(pacman) + ez; +diff(z) = e_c_m*(x1(-1)-z(-1)) + c_z_1*diff(z(-1)) + c_z_2*diff(z(-2)) + pac_expectation(pacman) + ez; end; @@ -69,6 +69,6 @@ end; // Initialize the PAC model (build the Companion VAR representation for the auxiliary model). pac.initialize('pacman'); -if ~isequal(M_.pac.pacman.equations.(M_.pac.pacman.tag_map{strcmp(M_.pac.pacman.tag_map(:,1), 'zpac'),2}).ec.istarget, [false, true]) +if ~isequal(M_.pac.pacman.equations.(M_.pac.pacman.tag_map{strcmp(M_.pac.pacman.tag_map(:,1), 'zpac'),2}).ec.istarget, [true, false]) error('ec.istarget vector is wrong.') end diff --git a/tests/trend-component-and-var-models/tcm6.mod b/tests/trend-component-and-var-models/tcm6.mod index 95c960a096762e1c7a807204cec348840855e473..a44bd6b42b1f495ad231f0622c3ad8818aad1999 100644 --- a/tests/trend-component-and-var-models/tcm6.mod +++ b/tests/trend-component-and-var-models/tcm6.mod @@ -108,15 +108,15 @@ diff(diff(log(U2_HH_OCOR))) = u2_hh_ocor_ecm_u2_q_yed_L1 * (U2_Q_YED(-1) - U2 U2_H_Q_YER400 = U2_H_Q_YER400(-1) + res_U2_H_Q_YER; [name='zpac'] -diff(log(U2_HH_COR)) = ecm_pac*(log(U2_HH_COR(-1))-log(U2_HH_OCOR(-1))) + +diff(log(U2_HH_COR)) = ecm_pac*(log(U2_HH_OCOR(-1))-log(U2_HH_COR(-1))) + u2_hh_cor_pac_u2_hh_cor_L1*diff(log(U2_HH_COR(-1))) + pac_expectation(pacman) + res_ez; [name='zpac1'] -diff(log(U2_HH_COR1)) = ecm_pac*(log(U2_HH_COR1(-1))-log(U2_HH_OCOR(-1))) + +diff(log(U2_HH_COR1)) = ecm_pac*(log(U2_HH_OCOR(-1))-log(U2_HH_COR1(-1))) + u2_hh_cor_pac_u2_hh_cor_L1*diff(log(U2_HH_COR1(-1))) + - pac_expectation(pacman1) + + pac_expectation(pacman1) + res_ez; end; diff --git a/tests/trend-component-and-var-models/tcm7.mod b/tests/trend-component-and-var-models/tcm7.mod index 01c4dd6eecc45633576a98c1e99f30943b97bf6f..d83815aaec63218ca7df3761b25c5c4c569f8970 100644 --- a/tests/trend-component-and-var-models/tcm7.mod +++ b/tests/trend-component-and-var-models/tcm7.mod @@ -109,15 +109,15 @@ diff(U2_STN) = u2_stn_ecm_u2_q_yed_L1 * (U2_Q_YED(-1) - U2_EHIC(-1)) + res_U2_STN ; [name='zpac'] -diff(log(U2_HH_COR)) = ecm_pac*(log(U2_HH_COR(-1))-log(U2_HH_OCOR(-1))) + +diff(log(U2_HH_COR)) = ecm_pac*(log(U2_HH_OCOR(-1))-log(U2_HH_COR(-1))) + u2_hh_cor_pac_u2_hh_cor_L1*diff(log(U2_HH_COR(-1))) + pac_expectation(pacman) + res_ez; [name='zpac1'] -diff(log(U2_HH_COR1)) = ecm_pac*(log(U2_HH_COR1(-1))-log(U2_HH_OCOR(-1))) + +diff(log(U2_HH_COR1)) = ecm_pac*(log(U2_HH_OCOR(-1))-log(U2_HH_COR1(-1))) + u2_hh_cor_pac_u2_hh_cor_L1*diff(log(U2_HH_COR1(-1))) + - pac_expectation(pacman1) + + pac_expectation(pacman1) + res_ez; end; diff --git a/tests/trend-component-and-var-models/tcm8.mod b/tests/trend-component-and-var-models/tcm8.mod index 99f937be690c1ce44e86e838c73f0abfe7360102..7269eb07e8778cebbea8716c19a1c4fcc665f573 100644 --- a/tests/trend-component-and-var-models/tcm8.mod +++ b/tests/trend-component-and-var-models/tcm8.mod @@ -108,13 +108,13 @@ diff(U2_STN) = u2_stn_ecm_u2_q_yed_L1 * (U2_Q_YED(-1) - U2_EHIC(-1)) + res_U2_STN ; [name='zpac'] -diff(log(U2_HH_COR)) = ecm_pac*(log(U2_HH_COR(-1))-log(U2_HH_OCOR(-1))) + +diff(log(U2_HH_COR)) = ecm_pac*(log(U2_HH_OCOR(-1))-log(U2_HH_COR(-1))) + u2_hh_cor_pac_u2_hh_cor_L1*diff(log(U2_HH_COR(-1))) + pac_expectation(pacman) + res_ez; [name='zpac1'] -diff(log(U2_HH_COR1)) = ecm_pac*(log(U2_HH_COR1(-1))-log(U2_HH_OCOR(-1))) + +diff(log(U2_HH_COR1)) = ecm_pac*(log(U2_HH_OCOR(-1))-log(U2_HH_COR1(-1))) + u2_hh_cor_pac_u2_hh_cor_L1*diff(log(U2_HH_COR1(-1))) + pac_expectation(pacman1) + res_ez;