diff --git a/static/mmci-cli/models/BRA_SAMBA08/BRA_SAMBA08.json b/static/mmci-cli/models/BRA_SAMBA08/BRA_SAMBA08.json index 4afdf08d..c84fe13e 100644 --- a/static/mmci-cli/models/BRA_SAMBA08/BRA_SAMBA08.json +++ b/static/mmci-cli/models/BRA_SAMBA08/BRA_SAMBA08.json @@ -66,7 +66,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -321,4 +321,4 @@ "text": "zr" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/BRA_SAMBA08/BRA_SAMBA08.mod b/static/mmci-cli/models/BRA_SAMBA08/BRA_SAMBA08.mod index 6a083f1a..790d5fcd 100644 --- a/static/mmci-cli/models/BRA_SAMBA08/BRA_SAMBA08.mod +++ b/static/mmci-cli/models/BRA_SAMBA08/BRA_SAMBA08.mod @@ -132,11 +132,11 @@ model(linear); //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = r*400; //* -inflation = (1/4)*(4*pi+4*pi(-1)+4*pi(-2)+4*pi(-3))*100; //* -inflationq = pi*400; //* -outputgap = yva*100; //* -output = y*100; //* +interest = r*4; //* +inflation = (1/4)*(4*pi+4*pi(-1)+4*pi(-2)+4*pi(-3)); //* +inflationq = pi*4; //* +outputgap = yva; //* +output = y; //* fispol = g_; //* //************************************************************************** diff --git a/static/mmci-cli/models/CA_BMZ12/CA_BMZ12.json b/static/mmci-cli/models/CA_BMZ12/CA_BMZ12.json index 2f74144c..0a71bd3b 100644 --- a/static/mmci-cli/models/CA_BMZ12/CA_BMZ12.json +++ b/static/mmci-cli/models/CA_BMZ12/CA_BMZ12.json @@ -64,7 +64,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -363,4 +363,4 @@ "text": "Technology shock process" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/CA_BMZ12/CA_BMZ12.mod b/static/mmci-cli/models/CA_BMZ12/CA_BMZ12.mod index 490eb5dc..324c57af 100644 --- a/static/mmci-cli/models/CA_BMZ12/CA_BMZ12.mod +++ b/static/mmci-cli/models/CA_BMZ12/CA_BMZ12.mod @@ -221,11 +221,11 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = log(rnt/rn_ss)*400; //* -inflationq = log(pit/pi_ss)*400; //* +interest = log(rnt/rn_ss)*4; //* +inflationq = log(pit/pi_ss)*4; //* inflation = 1/4*(inflationq+inflationq(-1)+inflationq(-2)+inflationq(-3)); //* -output = log(yt/y_ss)*100; //* -outputgap = log(yt/ytfp)*100; //* +output = log(yt/y_ss); //* +outputgap = log(yt/ytfp); //* //fispol = e_g; //* //************************************************************************** diff --git a/static/mmci-cli/models/EACZ_GEM03/EACZ_GEM03.json b/static/mmci-cli/models/EACZ_GEM03/EACZ_GEM03.json index 1d118765..088c3a89 100644 --- a/static/mmci-cli/models/EACZ_GEM03/EACZ_GEM03.json +++ b/static/mmci-cli/models/EACZ_GEM03/EACZ_GEM03.json @@ -30,7 +30,7 @@ ] }, "msr": null, - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -1057,4 +1057,4 @@ "text": "ZZ_XBALH_TOT_RAT" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/EACZ_GEM03/EACZ_GEM03.mod b/static/mmci-cli/models/EACZ_GEM03/EACZ_GEM03.mod index 42801167..de67226c 100644 --- a/static/mmci-cli/models/EACZ_GEM03/EACZ_GEM03.mod +++ b/static/mmci-cli/models/EACZ_GEM03/EACZ_GEM03.mod @@ -263,12 +263,12 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = 100*(RNOMF^4-interest_EXOG^4)/interest_EXOG^4; //* -inflation = 100*(PIE4F-PIE4F_EXOG)/PIE4F_EXOG; //* -inflationq = 100*(PIEF^4-PIE4F_EXOG)/PIE4F_EXOG; //* -outputgap = GDPGAPF; //* -output = GDPF*100; //* -fispol = E_GAF; //* +interest = (RNOMF^4-interest_EXOG^4)/interest_EXOG^4; //* +inflation = (PIE4F-PIE4F_EXOG)/PIE4F_EXOG; //* +inflationq = (PIEF^4-PIE4F_EXOG)/PIE4F_EXOG; //* +outputgap = GDPGAPF; //* +output = GDPF; //* +fispol = E_GAF; //* // Given inflation target for annual inflation is used as target for annualized quarterly inflation. //************************************************************************** diff --git a/static/mmci-cli/models/EA_CW05fm/EA_CW05fm.json b/static/mmci-cli/models/EA_CW05fm/EA_CW05fm.json index 84df6062..af89149c 100644 --- a/static/mmci-cli/models/EA_CW05fm/EA_CW05fm.json +++ b/static/mmci-cli/models/EA_CW05fm/EA_CW05fm.json @@ -64,7 +64,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -227,4 +227,4 @@ "text": "vindex" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/EA_CW05fm/EA_CW05fm.mod b/static/mmci-cli/models/EA_CW05fm/EA_CW05fm.mod index 46f98b64..8a9f9cf1 100644 --- a/static/mmci-cli/models/EA_CW05fm/EA_CW05fm.mod +++ b/static/mmci-cli/models/EA_CW05fm/EA_CW05fm.mod @@ -85,11 +85,11 @@ model(linear); //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = is*100; //* -inflation = infl*100; //* -inflationq = pi1*4*100; //* -outputgap = q*100; //* -output = q*100; //* +interest = is; //* +inflation = infl; //* +inflationq = pi1*4; //* +outputgap = q; //* +output = q; //* //************************************************************************** diff --git a/static/mmci-cli/models/EA_CW05ta/EA_CW05ta.json b/static/mmci-cli/models/EA_CW05ta/EA_CW05ta.json index 90e62e77..df3c48cf 100644 --- a/static/mmci-cli/models/EA_CW05ta/EA_CW05ta.json +++ b/static/mmci-cli/models/EA_CW05ta/EA_CW05ta.json @@ -64,7 +64,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -159,4 +159,4 @@ "text": "rl" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/EA_CW05ta/EA_CW05ta.mod b/static/mmci-cli/models/EA_CW05ta/EA_CW05ta.mod index b6a52ccd..882ef783 100644 --- a/static/mmci-cli/models/EA_CW05ta/EA_CW05ta.mod +++ b/static/mmci-cli/models/EA_CW05ta/EA_CW05ta.mod @@ -84,11 +84,11 @@ model(linear); //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = is*100; //* -inflation = infl*100; //* -inflationq = pi1*4*100; //* -outputgap = q*100; //* -output = q*100; //* +interest = is; //* +inflation = infl; //* +inflationq = pi1*4; //* +outputgap = q; //* +output = q; //* //************************************************************************** diff --git a/static/mmci-cli/models/EA_DKR11/EA_DKR11.json b/static/mmci-cli/models/EA_DKR11/EA_DKR11.json index 6e3affd9..e078866e 100644 --- a/static/mmci-cli/models/EA_DKR11/EA_DKR11.json +++ b/static/mmci-cli/models/EA_DKR11/EA_DKR11.json @@ -29,7 +29,7 @@ ] }, "msr": null, - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -1608,4 +1608,4 @@ "text": "ZWNR2_D" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/EA_DKR11/EA_DKR11.mod b/static/mmci-cli/models/EA_DKR11/EA_DKR11.mod index d488b160..bdbfe985 100644 --- a/static/mmci-cli/models/EA_DKR11/EA_DKR11.mod +++ b/static/mmci-cli/models/EA_DKR11/EA_DKR11.mod @@ -521,9 +521,9 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = log((1+R)/(1+RSS))*400; //* -inflation = (log(1+CPI)+log(1+CPI(-1))+log(1+CPI(-2))+log(1+CPI(-3)))*100; //* -inflationq = log(1+CPI)*400; //* +interest = log((1+R)/(1+RSS))*4; //* +inflation = (log(1+CPI)+log(1+CPI(-1))+log(1+CPI(-2))+log(1+CPI(-3))); //* +inflationq = log(1+CPI)*4; //* outputgap = YGAPobs; //* output = Yobs; //* fispol = E_G/100; //* diff --git a/static/mmci-cli/models/EA_GNSS10/EA_GNSS10.json b/static/mmci-cli/models/EA_GNSS10/EA_GNSS10.json index bb3ccdf2..0cb4fd25 100644 --- a/static/mmci-cli/models/EA_GNSS10/EA_GNSS10.json +++ b/static/mmci-cli/models/EA_GNSS10/EA_GNSS10.json @@ -63,7 +63,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -598,4 +598,4 @@ "text": "Yf" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/EA_GNSS10/EA_GNSS10.mod b/static/mmci-cli/models/EA_GNSS10/EA_GNSS10.mod index 61408232..5043a592 100644 --- a/static/mmci-cli/models/EA_GNSS10/EA_GNSS10.mod +++ b/static/mmci-cli/models/EA_GNSS10/EA_GNSS10.mod @@ -301,13 +301,13 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = 400*(exp(r_ib)-r_ib_ss); -inflation = (pie+pie(-1)+pie(-2)+pie(-3))*100; -inflationq = pie*400; -outputgap = (Y-Yf)*100; -output = (Y-0.273582784533271)*100; -//outputgap = (Y1-Y1f)*100; -//output = (Y1-0.250953431249047)*100; +interest = 4*(exp(r_ib)-r_ib_ss); +inflation = (pie+pie(-1)+pie(-2)+pie(-3)); +inflationq = pie*4; +outputgap = (Y-Yf); +output = (Y-0.273582784533271); +//outputgap = (Y1-Y1f); +//output = (Y1-0.250953431249047); //************************************************************************** //************************************************************************** diff --git a/static/mmci-cli/models/EA_QR14/EA_QR14.json b/static/mmci-cli/models/EA_QR14/EA_QR14.json index bd546688..f277cb1c 100644 --- a/static/mmci-cli/models/EA_QR14/EA_QR14.json +++ b/static/mmci-cli/models/EA_QR14/EA_QR14.json @@ -63,7 +63,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -970,4 +970,4 @@ "text": "yf_s" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/EA_QR14/EA_QR14.mod b/static/mmci-cli/models/EA_QR14/EA_QR14.mod index 62a793ac..6fc4916d 100644 --- a/static/mmci-cli/models/EA_QR14/EA_QR14.mod +++ b/static/mmci-cli/models/EA_QR14/EA_QR14.mod @@ -236,11 +236,11 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = 400*(r-log(RR_bar)); -inflation = (dpemu + dpemu(-1) + dpemu(-2) + dpemu(-3))*100; -inflationq = dpemu*400; -outputgap = (y_emu - y_emuf)*100; -output = (y_emu - log(L_total_bar))*100; +interest = 4*(r-log(RR_bar)); +inflation = (dpemu + dpemu(-1) + dpemu(-2) + dpemu(-3)); +inflationq = dpemu*4; +outputgap = (y_emu - y_emuf); +output = (y_emu - log(L_total_bar)); //************************************************************************** //************************************************************************** diff --git a/static/mmci-cli/models/EA_QUEST3/EA_QUEST3.json b/static/mmci-cli/models/EA_QUEST3/EA_QUEST3.json index adaac250..a73f873a 100644 --- a/static/mmci-cli/models/EA_QUEST3/EA_QUEST3.json +++ b/static/mmci-cli/models/EA_QUEST3/EA_QUEST3.json @@ -65,7 +65,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -592,4 +592,4 @@ "text": "Output Gap" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/EA_QUEST3/EA_QUEST3.mod b/static/mmci-cli/models/EA_QUEST3/EA_QUEST3.mod index 7d392682..3af70c16 100644 --- a/static/mmci-cli/models/EA_QUEST3/EA_QUEST3.mod +++ b/static/mmci-cli/models/EA_QUEST3/EA_QUEST3.mod @@ -221,10 +221,10 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = 100*((E_INOM+1)^4-interestq_exog^4)/interestq_exog^4; //* +interest = ((E_INOM+1)^4-interestq_exog^4)/interestq_exog^4; //* inflation = (1/4)*(inflationq+inflationq(-1)+inflationq(-2)+inflationq(-3)); //* -inflationq = 100*(4*E_PHIC+1-inflationannual_exog)/inflationannual_exog; //* -outputgap = 100*E_LYGAP; //* +inflationq = (4*E_PHIC+1-inflationannual_exog)/inflationannual_exog; //* +outputgap = E_LYGAP; //* fispol = E_EPS_G; //* //************************************************************************** diff --git a/static/mmci-cli/models/G3_CW03/G3_CW03.json b/static/mmci-cli/models/G3_CW03/G3_CW03.json index ef34878d..e36d93e5 100644 --- a/static/mmci-cli/models/G3_CW03/G3_CW03.json +++ b/static/mmci-cli/models/G3_CW03/G3_CW03.json @@ -64,7 +64,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -235,4 +235,4 @@ "text": "rl_us" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/G3_CW03/G3_CW03.mod b/static/mmci-cli/models/G3_CW03/G3_CW03.mod index 69026014..2c277110 100644 --- a/static/mmci-cli/models/G3_CW03/G3_CW03.mod +++ b/static/mmci-cli/models/G3_CW03/G3_CW03.mod @@ -176,11 +176,11 @@ model(linear); //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = is_us*100; //* -inflation = pi4_us*100; //* -inflationq = pi1_us*4*100; //* -outputgap = q_us*100; //* -output = q_us*100; //* +interest = is_us; //* +inflation = pi4_us; //* +inflationq = pi1_us*4; //* +outputgap = q_us; //* +output = q_us; //* //************************************************************************** diff --git a/static/mmci-cli/models/G7_TAY93/G7_TAY93.json b/static/mmci-cli/models/G7_TAY93/G7_TAY93.json index 8f6d571d..03e19e07 100644 --- a/static/mmci-cli/models/G7_TAY93/G7_TAY93.json +++ b/static/mmci-cli/models/G7_TAY93/G7_TAY93.json @@ -63,7 +63,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -1914,4 +1914,4 @@ "text": "yl76" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/G7_TAY93/G7_TAY93.mod b/static/mmci-cli/models/G7_TAY93/G7_TAY93.mod index 27332e18..ec932b18 100644 --- a/static/mmci-cli/models/G7_TAY93/G7_TAY93.mod +++ b/static/mmci-cli/models/G7_TAY93/G7_TAY93.mod @@ -378,11 +378,11 @@ model(linear); //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = 100*rs0; //* -inflation = 100*(lp0-lp40); //* -inflationq = 100*4*(lp0-lp10); //* -outputgap = 100*ygap0; //* -output = 100*y0/ybar0; //* +interest = rs0; //* +inflation = (lp0-lp40); //* +inflationq = 4*(lp0-lp10); //* +outputgap = ygap0; //* +output = 0/ybar0; //* fispol = lg0_; //* //************************************************************************** diff --git a/static/mmci-cli/models/NK_AFL15/NK_AFL15.mod b/static/mmci-cli/models/NK_AFL15/NK_AFL15.mod index edb3d684..09e71d69 100644 --- a/static/mmci-cli/models/NK_AFL15/NK_AFL15.mod +++ b/static/mmci-cli/models/NK_AFL15/NK_AFL15.mod @@ -157,11 +157,11 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables//* //* -interest = 400*(log(rn) - log(rnss)); //* -inflation = 100*(log(pai) + log(pai(-1)) + log(pai(-2)) + log(pai(-3)) - 4*log(PAIss)); //* -inflationq = 400*(log(pai) - log(PAIss)); //* -outputgap = 100*(log(y) - log(yf) - (log(yss) - steady_state(log(yf)))); //* -output = 100*(log(y) - log(yss)); //* +interest = 4(log(rn) - log(rnss)); //* +inflation = (log(pai) + log(pai(-1)) + log(pai(-2)) + log(pai(-3)) - 4*log(PAIss)); //* +inflationq = (log(pai) - log(PAIss)); //* +outputgap = (log(y) - log(yf) - (log(yss) - steady_state(log(yf)))); //* +output = (log(y) - log(yss)); //* fispol = ug; //* //************************************************************************** diff --git a/static/mmci-cli/models/NK_ET14/NK_ET14.json b/static/mmci-cli/models/NK_ET14/NK_ET14.json index f438c2e3..66edbb37 100644 --- a/static/mmci-cli/models/NK_ET14/NK_ET14.json +++ b/static/mmci-cli/models/NK_ET14/NK_ET14.json @@ -63,7 +63,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { diff --git a/static/mmci-cli/models/NK_ET14/NK_ET14.mod b/static/mmci-cli/models/NK_ET14/NK_ET14.mod index 5e260486..c25bc719 100644 --- a/static/mmci-cli/models/NK_ET14/NK_ET14.mod +++ b/static/mmci-cli/models/NK_ET14/NK_ET14.mod @@ -212,11 +212,11 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables//* //* -interest = 400*(i - steady_state(i)); //* -inflation = (Pi + Pi(-1) + Pi(-2) + Pi(-3) - 4*steady_state(Pi))*100; //* -inflationq = 400*(Pi - steady_state(Pi)); //* -outputgap = (Y - Yf - (steady_state(Y) - steady_state(Yf)))*100; //* -output = 100*(Y - steady_state(Y)); //* +interest = 4*(i - steady_state(i)); //* +inflation = (Pi + Pi(-1) + Pi(-2) + Pi(-3) - 4*steady_state(Pi)); //* +inflationq = 4*(Pi - steady_state(Pi)); //* +outputgap = (Y - Yf - (steady_state(Y) - steady_state(Yf))); //* +output = (Y - steady_state(Y)); //* fispol = epsG; //* //************************************************************************** diff --git a/static/mmci-cli/models/NK_GK11/NK_GK11.json b/static/mmci-cli/models/NK_GK11/NK_GK11.json index ea629f87..e21caa18 100644 --- a/static/mmci-cli/models/NK_GK11/NK_GK11.json +++ b/static/mmci-cli/models/NK_GK11/NK_GK11.json @@ -29,7 +29,7 @@ ] }, "msr": null, - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -352,4 +352,4 @@ "text": "zf" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/NK_GK11/NK_GK11.mod b/static/mmci-cli/models/NK_GK11/NK_GK11.mod index c97db182..3fb671b0 100644 --- a/static/mmci-cli/models/NK_GK11/NK_GK11.mod +++ b/static/mmci-cli/models/NK_GK11/NK_GK11.mod @@ -139,11 +139,11 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = 400*(i-log(1/betta)); //* -inflation = (infl+infl(-1)+infl(-2)+infl(-3))*100; //* -inflationq = 400*infl; //* -outputgap = (Y-Yf)*100; //* -output = (Y-Y_ss)*100; //* +interest = 4*(i-log(1/betta)); //* +inflation = (infl+infl(-1)+infl(-2)+infl(-3)); //* +inflationq = 4*infl; //* +outputgap = (Y-Yf); //* +output = (Y-Y_ss); //* fispol = e_g; //* //************************************************************************** diff --git a/static/mmci-cli/models/NK_GM05/NK_GM05.json b/static/mmci-cli/models/NK_GM05/NK_GM05.json index 17774e0d..dc38d705 100644 --- a/static/mmci-cli/models/NK_GM05/NK_GM05.json +++ b/static/mmci-cli/models/NK_GM05/NK_GM05.json @@ -29,7 +29,7 @@ ] }, "msr": null, - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -124,4 +124,4 @@ "text": "ystar" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/NK_GM05/NK_GM05.mod b/static/mmci-cli/models/NK_GM05/NK_GM05.mod index 50f4d1b5..76720801 100644 --- a/static/mmci-cli/models/NK_GM05/NK_GM05.mod +++ b/static/mmci-cli/models/NK_GM05/NK_GM05.mod @@ -85,11 +85,11 @@ model(linear); //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables//* -interest = r*400; //* -inflation = (100/4)*(4*pi+4*pi(-1)+4*pi(-2)+4*pi(-3)); //* -inflationq = pi*400; //* -outputgap = x*100; //* -output = y*100; //* +interest = r*4; //* +inflation = (1/4)*(4*pi+4*pi(-1)+4*pi(-2)+4*pi(-3)); //* +inflationq = pi*4; //* +outputgap = x; //* +output = y; //* //************************************************************************** diff --git a/static/mmci-cli/models/NK_GSSZ17/NK_GSSZ17.mod b/static/mmci-cli/models/NK_GSSZ17/NK_GSSZ17.mod index 13b3a46b..b6f2ecf6 100644 --- a/static/mmci-cli/models/NK_GSSZ17/NK_GSSZ17.mod +++ b/static/mmci-cli/models/NK_GSSZ17/NK_GSSZ17.mod @@ -100,11 +100,11 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables//* //* -interest = 400*(log(R) - log(steady_state(R))); //* -inflation = 100*(log(pii)+log(pii(-1))+log(pii(-2))+log(pii(-3))-4*log(steady_state(pii))); //* -inflationq = 400*(log(pii) - log(steady_state(pii))); //* -outputgap = 100*(log(y) - log(y_f) - (log(steady_state(y)) - log(steady_state(y_f)))); -output = 100*(log(y) - log(steady_state(y))); //* +interest = 4*(log(R) - log(steady_state(R))); //* +inflation = (log(pii)+log(pii(-1))+log(pii(-2))+log(pii(-3))-4*log(steady_state(pii))); //* +inflationq = 4*(log(pii) - log(steady_state(pii))); //* +outputgap = (log(y) - log(y_f) - (log(steady_state(y)) - log(steady_state(y_f)))); +output = (log(y) - log(steady_state(y))); //* //fispol = epsG; //* //************************************************************************** diff --git a/static/mmci-cli/models/NK_JO15_ht/NK_JO15_ht.json b/static/mmci-cli/models/NK_JO15_ht/NK_JO15_ht.json index 12e53404..9ef45d5a 100644 --- a/static/mmci-cli/models/NK_JO15_ht/NK_JO15_ht.json +++ b/static/mmci-cli/models/NK_JO15_ht/NK_JO15_ht.json @@ -64,7 +64,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -199,4 +199,4 @@ "text": "y_star" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/NK_JO15_lt/NK_JO15_lt.json b/static/mmci-cli/models/NK_JO15_lt/NK_JO15_lt.json index 43c08bba..11a69916 100644 --- a/static/mmci-cli/models/NK_JO15_lt/NK_JO15_lt.json +++ b/static/mmci-cli/models/NK_JO15_lt/NK_JO15_lt.json @@ -64,7 +64,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -199,4 +199,4 @@ "text": "y_star" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/NK_KW16/NK_KW16.json b/static/mmci-cli/models/NK_KW16/NK_KW16.json index 60782136..960927bc 100644 --- a/static/mmci-cli/models/NK_KW16/NK_KW16.json +++ b/static/mmci-cli/models/NK_KW16/NK_KW16.json @@ -63,7 +63,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -410,4 +410,4 @@ "text": "Z_fe" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/NK_KW16/NK_KW16.mod b/static/mmci-cli/models/NK_KW16/NK_KW16.mod index 05462608..54c4561f 100644 --- a/static/mmci-cli/models/NK_KW16/NK_KW16.mod +++ b/static/mmci-cli/models/NK_KW16/NK_KW16.mod @@ -228,11 +228,11 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = log(i/i_ss)*400; //* -inflationq = log(infl/infl_ss)*400; //* +interest = log(i/i_ss)*4; //* +inflationq = log(infl/infl_ss)*4; //* inflation = 1/4*(inflationq+inflationq(-1)+inflationq(-2)+inflationq(-3)); //* -output = log(Y/Y_ss)*100; //* -outputgap = log(Y/Y_fe)*100; //* +output = log(Y/Y_ss); //* +outputgap = log(Y/Y_fe); //* fispol = e_g; //************************************************************************** diff --git a/static/mmci-cli/models/NK_MCN99cr/NK_MCN99cr.json b/static/mmci-cli/models/NK_MCN99cr/NK_MCN99cr.json index 382c7682..1e8bfb89 100644 --- a/static/mmci-cli/models/NK_MCN99cr/NK_MCN99cr.json +++ b/static/mmci-cli/models/NK_MCN99cr/NK_MCN99cr.json @@ -63,7 +63,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -146,4 +146,4 @@ "text": "ytilde" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/NK_MCN99cr/NK_MCN99cr.mod b/static/mmci-cli/models/NK_MCN99cr/NK_MCN99cr.mod index 29e97cb1..5a8b93df 100644 --- a/static/mmci-cli/models/NK_MCN99cr/NK_MCN99cr.mod +++ b/static/mmci-cli/models/NK_MCN99cr/NK_MCN99cr.mod @@ -85,10 +85,10 @@ model(linear); //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables//* -interest = 100*4*R; //* -inflation = 100*(1/4)*(4*pi + 4*pi(-1) + 4*pi(-2) + 4*pi(-3)); //* -inflationq = 100*4*pi; //* -outputgap = 100*ytilde; //* +interest = 4*R; //* +inflation = (1/4)*(4*pi + 4*pi(-1) + 4*pi(-2) + 4*pi(-3)); //* +inflationq = 4*pi; //* +outputgap = ytilde; //* //************************************************************************** diff --git a/static/mmci-cli/models/NK_MM10/NK_MM10.json b/static/mmci-cli/models/NK_MM10/NK_MM10.json index cdc01ceb..34f5ef2b 100644 --- a/static/mmci-cli/models/NK_MM10/NK_MM10.json +++ b/static/mmci-cli/models/NK_MM10/NK_MM10.json @@ -60,7 +60,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -399,4 +399,4 @@ "text": "Yf" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/NK_MM10/NK_MM10.mod b/static/mmci-cli/models/NK_MM10/NK_MM10.mod index ca8ecf73..dca23f5c 100644 --- a/static/mmci-cli/models/NK_MM10/NK_MM10.mod +++ b/static/mmci-cli/models/NK_MM10/NK_MM10.mod @@ -406,14 +406,14 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* //* -//interest = (Rd^4-steady_state(Rd)^4)/(steady_state(Rd)^4)*100; -interest = log(Rd/steady_state(Rd))*400; -inflationq = log(infl/steady_state(infl))*400; +//interest = (Rd^4-steady_state(Rd)^4)/(steady_state(Rd)^4); +interest = log(Rd/steady_state(Rd))*4; +inflationq = log(infl/steady_state(infl))*4; inflation = 1/4*(inflationq+inflationq(-1)+inflationq(-2)+inflationq(-3)); //inflation = (infl*infl(-1)*infl(-2)*infl(-3)-steady_state(infl)^4)/(steady_state(infl)^4)*100; //* //inflationq = ((infl^4-steady_state(infl)^4)/steady_state(infl)^4)*100; //* -output = (log(Y)-log(steady_state(Y)))*100; //* -outputgap = (log(Y)-log(Yf))*100; //* +output = (log(Y)-log(steady_state(Y))); //* +outputgap = (log(Y)-log(Yf)); //* //************************************************************************** //************************************************************************** diff --git a/static/mmci-cli/models/NK_MPT10/NK_MPT10.json b/static/mmci-cli/models/NK_MPT10/NK_MPT10.json index fcbeb902..2413bb59 100644 --- a/static/mmci-cli/models/NK_MPT10/NK_MPT10.json +++ b/static/mmci-cli/models/NK_MPT10/NK_MPT10.json @@ -64,7 +64,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -363,4 +363,4 @@ "text": "Y_fe" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/NK_MPT10/NK_MPT10.mod b/static/mmci-cli/models/NK_MPT10/NK_MPT10.mod index 7d996910..f2e6a338 100644 --- a/static/mmci-cli/models/NK_MPT10/NK_MPT10.mod +++ b/static/mmci-cli/models/NK_MPT10/NK_MPT10.mod @@ -168,11 +168,11 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = log((1+i_nom)/(1+i_nom_ss))*400; //* -inflationq = log(infl/infl_ss)*400; //* +interest = log((1+i_nom)/(1+i_nom_ss))*4; //* +inflationq = log(infl/infl_ss)*4; //* inflation = 1/4*(inflationq+inflationq(-1)+inflationq(-2)+inflationq(-3)); //* -output = log(Y/Y_ss)*100; //* -outputgap = log(Y/Y_fe)*100; //* +output = log(Y/Y_ss); //* +outputgap = log(Y/Y_fe); //* fispol = e; //************************************************************************** diff --git a/static/mmci-cli/models/NK_ST13/NK_ST13.json b/static/mmci-cli/models/NK_ST13/NK_ST13.json index 2e7010eb..83ad115d 100644 --- a/static/mmci-cli/models/NK_ST13/NK_ST13.json +++ b/static/mmci-cli/models/NK_ST13/NK_ST13.json @@ -62,7 +62,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -309,4 +309,4 @@ "text": "yn_fe" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/NK_ST13/NK_ST13.mod b/static/mmci-cli/models/NK_ST13/NK_ST13.mod index ecc62dc5..ed9dc4a8 100644 --- a/static/mmci-cli/models/NK_ST13/NK_ST13.mod +++ b/static/mmci-cli/models/NK_ST13/NK_ST13.mod @@ -114,11 +114,11 @@ IMP_ss = R_ss-Rd_ss; % inside money premium model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = log(R/R_ss)*400; //* -inflationq = log(pi/pi_ss)*400; //* +interest = log(R/R_ss)*4; //* +inflationq = log(pi/pi_ss)*4; //* inflation = 1/4*(inflationq+inflationq(-1)+inflationq(-2)+inflationq(-3)); //* -output = log(y/y_ss)*100; //* -outputgap = log(y/y_fe)*100; //* +output = log(y/y_ss); //* +outputgap = log(y/y_fe); //* %fispol = 0; //* //************************************************************************** diff --git a/static/mmci-cli/models/RBC_DTT11/RBC_DTT11.json b/static/mmci-cli/models/RBC_DTT11/RBC_DTT11.json index 35a5ff62..070d2f0c 100644 --- a/static/mmci-cli/models/RBC_DTT11/RBC_DTT11.json +++ b/static/mmci-cli/models/RBC_DTT11/RBC_DTT11.json @@ -63,7 +63,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -214,4 +214,4 @@ "text": "zbar_t" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/RBC_DTT11/RBC_DTT11.mod b/static/mmci-cli/models/RBC_DTT11/RBC_DTT11.mod index fa34669f..58b70393 100644 --- a/static/mmci-cli/models/RBC_DTT11/RBC_DTT11.mod +++ b/static/mmci-cli/models/RBC_DTT11/RBC_DTT11.mod @@ -81,10 +81,10 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = 400*r_t; //* -inflation = (100/4)*(4*pi_t+4*pi_t(-1)+4*pi_t(-2)+4*pi_t(-3)); //* -inflationq = 400*pi_t; //* -output = 100*y_t; //* +interest = 4*r_t; //* +inflation = (1/4)*(4*pi_t+4*pi_t(-1)+4*pi_t(-2)+4*pi_t(-3)); //* +inflationq = 4*pi_t; //* +output = y_t; //* outputgap = 0; //* //************************************************************************** diff --git a/static/mmci-cli/models/US_CCF12/US_CCF12.mod b/static/mmci-cli/models/US_CCF12/US_CCF12.mod index 3e9d01a0..3a9a22a7 100644 --- a/static/mmci-cli/models/US_CCF12/US_CCF12.mod +++ b/static/mmci-cli/models/US_CCF12/US_CCF12.mod @@ -177,11 +177,11 @@ model(linear); //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = FFR*100; //* -inflation = (pi + pi(-1) + pi(-2) + pi(-3))*100; //* -inflationq = pi*400; //* -outputgap = ygap*100/4; //* -output = y*100/4; //* +interest = FFR; //* +inflation = (pi + pi(-1) + pi(-2) + pi(-3)); //* +inflationq = pi*4; //* +outputgap = ygap/4; //* +output = y/4; //* fispol = eps_Gz; //* //************************************************************************** diff --git a/static/mmci-cli/models/US_CD08/US_CD08.json b/static/mmci-cli/models/US_CD08/US_CD08.json index f5fc11cc..cce39001 100644 --- a/static/mmci-cli/models/US_CD08/US_CD08.json +++ b/static/mmci-cli/models/US_CD08/US_CD08.json @@ -29,7 +29,7 @@ ] }, "msr": null, - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -212,4 +212,4 @@ "text": "z_f" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/US_CD08/US_CD08.mod b/static/mmci-cli/models/US_CD08/US_CD08.mod index 9d178e6a..41377e0a 100644 --- a/static/mmci-cli/models/US_CD08/US_CD08.mod +++ b/static/mmci-cli/models/US_CD08/US_CD08.mod @@ -106,11 +106,11 @@ model(linear); //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = r*400; //* -inflation = (pi+pi(-1)+pi(-2)+pi(-3))*100; //* -inflationq = pi*400; //* -outputgap = (y-y_f)*100; //* -output = y*100; //* +interest = r*4; //* +inflation = (pi+pi(-1)+pi(-2)+pi(-3))*1; //* +inflationq = pi*4; //* +outputgap = (y-y_f)*1; //* +output = y*1; //* //fispol = 0; //* //************************************************************************** diff --git a/static/mmci-cli/models/US_CET15/US_CET15.mod b/static/mmci-cli/models/US_CET15/US_CET15.mod index d00e84d4..95513fe2 100644 --- a/static/mmci-cli/models/US_CET15/US_CET15.mod +++ b/static/mmci-cli/models/US_CET15/US_CET15.mod @@ -321,21 +321,21 @@ exp(nGR)=nG; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = 400*(RAGG-steady_state(RAGG)); +interest = 4*(RAGG-steady_state(RAGG)); inflation = 1/4*(inflationq+inflationq(-1)+inflationq(-2)+inflationq(-3)); -inflationq = 400*(piAGG-steady_state(piAGG)); +inflationq = 4*(piAGG-steady_state(piAGG)); outputgap = GDPAGG -steady_state(GDPAGG); -output = 100*(GDPAGG -steady_state(GDPAGG)); +output = 1*(GDPAGG -steady_state(GDPAGG)); -interestF = 400*(RF-steady_state(RR)); +interestF = 4*(RF-steady_state(RR)); inflationF = inflationq+inflationq(-1)+inflationq(-2)+inflationq(-3); -inflationqF = 400*(piF-steady_state(piR)); +inflationqF = 4*(piF-steady_state(piR)); outputgapF = GDPF -steady_state(GDPR); outputF = (GDPF -steady_state(GDPR)); -interestR = 400*(RR-steady_state(RR)); +interestR = 4*(RR-steady_state(RR)); inflationR = inflationq+inflationq(-1)+inflationq(-2)+inflationq(-3); -inflationqR = 400*(piR-steady_state(piR)); +inflationqR = 4*(piR-steady_state(piR)); outputgapR = GDPR -steady_state(GDPR); outputR = (GDPR -steady_state(GDPR)); diff --git a/static/mmci-cli/models/US_CFP17endo/US_CFP17endo.mod b/static/mmci-cli/models/US_CFP17endo/US_CFP17endo.mod index 0e66b80b..6011c810 100644 --- a/static/mmci-cli/models/US_CFP17endo/US_CFP17endo.mod +++ b/static/mmci-cli/models/US_CFP17endo/US_CFP17endo.mod @@ -92,7 +92,7 @@ for i=1:33 //change? eval(['M_.params(i) = ' deep_parameter_name ' ;']) end cd(thispath); - //* +std_r_ =100; //* // Definition of Discretionary Fiscal Policy Parameter //* //coffispol = 1; //* //************************************************************************** @@ -103,11 +103,11 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = ann_r1*100; //* -inflation = (pin + pin(-1) + pin(-2) + pin(-3))*100; //* -inflationq = 400*pin; //(1/4)*infl*100; //* -outputgap = ygap*100; //* -output = y*100; //* //* +interest = ann_r1*1; //* +inflation = (pin + pin(-1) + pin(-2) + pin(-3))*1; //* +inflationq = 4*pin; //(1/4)*infl*1; //* +outputgap = ygap*1; //* +output = y*1; //* //* //************************************************************************** //************************************************************************** // Policy Rule //* diff --git a/static/mmci-cli/models/US_CFP17exo/US_CFP17exo.mod b/static/mmci-cli/models/US_CFP17exo/US_CFP17exo.mod index e4a48072..b91b9674 100644 --- a/static/mmci-cli/models/US_CFP17exo/US_CFP17exo.mod +++ b/static/mmci-cli/models/US_CFP17exo/US_CFP17exo.mod @@ -103,11 +103,11 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = ann_r1*100; //* -inflation = (pin + pin(-1) + pin(-2) + pin(-3))*100; //* -inflationq = 400*pin; //(1/4)*infl*100; //* -outputgap = ygap*100; //* -output = y*100; //* //* +interest = ann_r1*1; //* +inflation = (pin + pin(-1) + pin(-2) + pin(-3))*1; //* +inflationq = 4*pin; //(1/4)*infl*1; //* +outputgap = ygap*1; //* +output = y*1; //* //* //************************************************************************** //************************************************************************** // Policy Rule //* diff --git a/static/mmci-cli/models/US_CMR10/US_CMR10.json b/static/mmci-cli/models/US_CMR10/US_CMR10.json index acb4723b..47651a5b 100644 --- a/static/mmci-cli/models/US_CMR10/US_CMR10.json +++ b/static/mmci-cli/models/US_CMR10/US_CMR10.json @@ -31,7 +31,7 @@ ] }, "msr": null, - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -402,4 +402,4 @@ "text": "zetaiU" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/US_CMR10/US_CMR10.mod b/static/mmci-cli/models/US_CMR10/US_CMR10.mod index bebf94cf..9755a0da 100644 --- a/static/mmci-cli/models/US_CMR10/US_CMR10.mod +++ b/static/mmci-cli/models/US_CMR10/US_CMR10.mod @@ -100,11 +100,11 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables//* -interest = 100*( (1+ReXU)^4 - (1+ReXUU)^4 )/((1+ReXUU)^4); //* +interest = 1*( (1+ReXU)^4 - (1+ReXUU)^4 )/((1+ReXUU)^4); //* inflation = 1/4*(inflationq+inflationq(-1)+inflationq(-2)+inflationq(-3));//* -inflationq = 100*(piU^4-piUU^4)/(piUU^4); //* -outputgap = 100*(YU-YflexU)/YUU; //* -output = 100*(YU-YUU)/YUU; //* +inflationq = 1*(piU^4-piUU^4)/(piUU^4); //* +outputgap = 1*(YU-YflexU)/YUU; //* +output = 1*(YU-YUU)/YUU; //* //************************************************************************** diff --git a/static/mmci-cli/models/US_CMR10fa/US_CMR10fa.json b/static/mmci-cli/models/US_CMR10fa/US_CMR10fa.json index 5d399551..edaf2962 100644 --- a/static/mmci-cli/models/US_CMR10fa/US_CMR10fa.json +++ b/static/mmci-cli/models/US_CMR10fa/US_CMR10fa.json @@ -31,7 +31,7 @@ ] }, "msr": null, - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -306,4 +306,4 @@ "text": "zetaiU" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/US_CMR10fa/US_CMR10fa.mod b/static/mmci-cli/models/US_CMR10fa/US_CMR10fa.mod index 749498ef..2f4683a0 100644 --- a/static/mmci-cli/models/US_CMR10fa/US_CMR10fa.mod +++ b/static/mmci-cli/models/US_CMR10fa/US_CMR10fa.mod @@ -100,11 +100,11 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables//* -interest = 100*( (1+ReXU)^4 - (1+ReXUU)^4 )/((1+ReXUU)^4); //* +interest = 1*( (1+ReXU)^4 - (1+ReXUU)^4 )/((1+ReXUU)^4); //* inflation = 1/4*(inflationq+inflationq(-1)+inflationq(-2)+inflationq(-3));//* -inflationq = 100*(piU^4-piUU^4)/(piUU^4); //* -outputgap = 100*(YU-YflexU)/YUU; //* -output = 100*(YU-YUU)/YUU; //* +inflationq = 1*(piU^4-piUU^4)/(piUU^4); //* +outputgap = 1*(YU-YflexU)/YUU; //* +output = 1*(YU-YUU)/YUU; //* //************************************************************************** diff --git a/static/mmci-cli/models/US_CMR14/US_CMR14.json b/static/mmci-cli/models/US_CMR14/US_CMR14.json index 015015cb..01c300f8 100644 --- a/static/mmci-cli/models/US_CMR14/US_CMR14.json +++ b/static/mmci-cli/models/US_CMR14/US_CMR14.json @@ -65,7 +65,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -596,4 +596,4 @@ "text": "zetai" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/US_CMR14/US_CMR14.mod b/static/mmci-cli/models/US_CMR14/US_CMR14.mod index 93753be0..0068c460 100644 --- a/static/mmci-cli/models/US_CMR14/US_CMR14.mod +++ b/static/mmci-cli/models/US_CMR14/US_CMR14.mod @@ -11,7 +11,7 @@ // Further references: //Christiano, L. J., Motto, R., Rostagno, M., 2014. Risk shocks. -//American Economic Review 104 (1), 27–65. +//American Economic Review 104 (1), 27–65. // Last edited: 2016/02/24 by M. Kuete @@ -296,13 +296,13 @@ model; //***************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* - interest = 100*( (1+Re)^4 - (1+Re_p)^4 )/((1+Re_p)^4); // 400*(Re - Re_p);//* - inflationq = 100*(pi^4-pi_p^4)/(pi_p^4); //* + interest = 1*( (1+Re)^4 - (1+Re_p)^4 )/((1+Re_p)^4); // 4*(Re - Re_p);//* + inflationq = 1*(pi^4-pi_p^4)/(pi_p^4); //* inflation = 1/4*(inflationq+inflationq(-1)+inflationq(-2)+inflationq(-3)); //* -// output = (log(yz)-log(steady_state(yz)))*100; //* -// outputgap = (log(yz)-log(yzf))*100; //* - output = (log(y)-log(steady_state(y)))*100; //* - outputgap = (log(y)-log(yf))*100; //* +// output = (log(yz)-log(steady_state(yz)))*1; //* +// outputgap = (log(yz)-log(yzf))*1; //* + output = (log(y)-log(steady_state(y)))*1; //* + outputgap = (log(y)-log(yf))*1; //* fispol = e_g; //* //************************************************************************** @@ -875,4 +875,4 @@ var e_xi1; stderr 1-@{stopsignal}; end; -//stoch_simul(order=1, irf=40,nograph); \ No newline at end of file +//stoch_simul(order=1, irf=40,nograph); diff --git a/static/mmci-cli/models/US_CMR14noFA/US_CMR14noFA.json b/static/mmci-cli/models/US_CMR14noFA/US_CMR14noFA.json index d635816f..602635c5 100644 --- a/static/mmci-cli/models/US_CMR14noFA/US_CMR14noFA.json +++ b/static/mmci-cli/models/US_CMR14noFA/US_CMR14noFA.json @@ -31,7 +31,7 @@ ] }, "msr": null, - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -306,4 +306,4 @@ "text": "zetai" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/US_CMR14noFA/US_CMR14noFA.mod b/static/mmci-cli/models/US_CMR14noFA/US_CMR14noFA.mod index ff8efbc1..659400c3 100644 --- a/static/mmci-cli/models/US_CMR14noFA/US_CMR14noFA.mod +++ b/static/mmci-cli/models/US_CMR14noFA/US_CMR14noFA.mod @@ -237,11 +237,11 @@ y = g + c + i / muup; //***************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* - interest = 100*( (1+Re)^4 - (1+Re_p)^4 )/((1+Re_p)^4); // 400*(Re - Re_p);//* - inflationq = 100*(pi^4-pi_p^4)/(pi_p^4); // 400*log(pi/pi_p); //* + interest = 1*( (1+Re)^4 - (1+Re_p)^4 )/((1+Re_p)^4); // 4*(Re - Re_p);//* + inflationq = 1*(pi^4-pi_p^4)/(pi_p^4); // 4*log(pi/pi_p); //* inflation = 1/4*(inflationq+inflationq(-1)+inflationq(-2)+inflationq(-3)); //* - output = (log(y)-log(steady_state(y)))*100; //* - outputgap = (log(y)-log(yf))*100; //* + output = (log(y)-log(steady_state(y)))*1; //* + outputgap = (log(y)-log(yf))*1; //* fispol = e_g; //* //************************************************************************** diff --git a/static/mmci-cli/models/US_CPS10/US_CPS10.mod b/static/mmci-cli/models/US_CPS10/US_CPS10.mod index 1f7c8793..ab314801 100644 --- a/static/mmci-cli/models/US_CPS10/US_CPS10.mod +++ b/static/mmci-cli/models/US_CPS10/US_CPS10.mod @@ -142,7 +142,7 @@ for i=1:33 eval(['M_.params(i) = ' deep_parameter_name ' ;']) end cd(thispath); - //* +std_r_=100; //* // Definition of Discretionary Fiscal Policy Parameter //* // coffispol = 1; //* //************************************************************************** diff --git a/static/mmci-cli/models/US_FGKR15/US_FGKR15.mod b/static/mmci-cli/models/US_FGKR15/US_FGKR15.mod index 122b6059..b3b7c9f7 100644 --- a/static/mmci-cli/models/US_FGKR15/US_FGKR15.mod +++ b/static/mmci-cli/models/US_FGKR15/US_FGKR15.mod @@ -244,12 +244,12 @@ model ; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables -interest = 400*(Rt-log(Rs)); -inflation = ((inflt+inflt(-1)+inflt(-2)+inflt(-3))*100) - 400*log(infls); -inflationq = 400*(inflt-log(infls)); -outputgap = ((exp(yt)/exp(ytF))-1)*100; -output = 100*(yt-log(ys)); -fispol = egt*100; +interest = 4*(Rt-log(Rs)); +inflation = ((inflt+inflt(-1)+inflt(-2)+inflt(-3))*1) - 4*log(infls); +inflationq = 4*(inflt-log(infls)); +outputgap = ((exp(yt)/exp(ytF))-1)*1; +output = 1*(yt-log(ys)); +fispol = egt*1; // ************************************************************************** diff --git a/static/mmci-cli/models/US_FRB03/US_FRB03.json b/static/mmci-cli/models/US_FRB03/US_FRB03.json index 962392f6..f7c3ad00 100644 --- a/static/mmci-cli/models/US_FRB03/US_FRB03.json +++ b/static/mmci-cli/models/US_FRB03/US_FRB03.json @@ -30,7 +30,7 @@ ] }, "msr": null, - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -1369,4 +1369,4 @@ "text": "zynid" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/US_FRB03/US_FRB03.mod b/static/mmci-cli/models/US_FRB03/US_FRB03.mod index d4cfbdb5..56f52927 100644 --- a/static/mmci-cli/models/US_FRB03/US_FRB03.mod +++ b/static/mmci-cli/models/US_FRB03/US_FRB03.mod @@ -595,7 +595,7 @@ interest = rffe; //* inflation = (1/4)*(picnia+ picnia(-1)+ picnia(-2)+ picnia(-3)); //* inflationq = picnia; //* outputgap = xgap2; //* -output = xgdp*100; //* +output = xgdp*1; //* fispol = egfl_; //* fispol = egfi_; //* fispol = egfos; //* diff --git a/static/mmci-cli/models/US_FRB08/US_FRB08.json b/static/mmci-cli/models/US_FRB08/US_FRB08.json index 9e6a2572..66d3583a 100644 --- a/static/mmci-cli/models/US_FRB08/US_FRB08.json +++ b/static/mmci-cli/models/US_FRB08/US_FRB08.json @@ -28,7 +28,7 @@ ] }, "msr": null, - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -1739,4 +1739,4 @@ "text": "zynid" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/US_FRB08/US_FRB08.mod b/static/mmci-cli/models/US_FRB08/US_FRB08.mod index c1418aa9..fcf65d1d 100644 --- a/static/mmci-cli/models/US_FRB08/US_FRB08.mod +++ b/static/mmci-cli/models/US_FRB08/US_FRB08.mod @@ -2132,7 +2132,7 @@ interest = rffe; //* inflation = (1/4)*(picnia+ picnia(-1)+ picnia(-2)+ picnia(-3)); //* inflationq = picnia; //* outputgap = xgap2; //* -output = xgdp*100; //* +output = xgdp*1; //* fispol = egfi_; //* fispol = egfl_; //* //************************************************************************** diff --git a/static/mmci-cli/models/US_FRB08mx/US_FRB08mx.json b/static/mmci-cli/models/US_FRB08mx/US_FRB08mx.json index e526e085..aee51613 100644 --- a/static/mmci-cli/models/US_FRB08mx/US_FRB08mx.json +++ b/static/mmci-cli/models/US_FRB08mx/US_FRB08mx.json @@ -30,7 +30,7 @@ ] }, "msr": null, - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -2045,4 +2045,4 @@ "text": "zynid" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/US_FRB08mx/US_FRB08mx.mod b/static/mmci-cli/models/US_FRB08mx/US_FRB08mx.mod index 6c0f6a96..adf4ce49 100644 --- a/static/mmci-cli/models/US_FRB08mx/US_FRB08mx.mod +++ b/static/mmci-cli/models/US_FRB08mx/US_FRB08mx.mod @@ -2138,7 +2138,7 @@ interest = rffe; //* inflation = (1/4)*(picnia+picnia(-1)+picnia(-2)+picnia(-3)); //* inflationq = picnia; //* outputgap = xgap2; //* -output = xgdp*100; //* +output = xgdp*1; //* fispol = egfi_; //* fispol = egfl_; //* //************************************************************************** @@ -2674,4 +2674,4 @@ end; %load Sigma_US_FRB08mx.mat; %M_.Sigma_e = Sigma_e_; -%options_.Schur_vec_tol = 1e-6; \ No newline at end of file +%options_.Schur_vec_tol = 1e-6; diff --git a/static/mmci-cli/models/US_FV10/US_FV10.mod b/static/mmci-cli/models/US_FV10/US_FV10.mod index 2cf8e827..1971dfe7 100644 --- a/static/mmci-cli/models/US_FV10/US_FV10.mod +++ b/static/mmci-cli/models/US_FV10/US_FV10.mod @@ -182,11 +182,11 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables//* //* -interest = 400*(log(R) - log(steady_state(R))); //* -inflation = 100*(log(PI) + log(PI(-1)) + log(PI(-2)) + log(PI(-3)) - 4*log(steady_state(PI))); //* -inflationq = 400*(log(PI) - log(steady_state(PI))); //* -outputgap = 100*(log(yd) - log(ydf) - (log(steady_state(yd)) - log(steady_state(ydf)))); -output = 100*(log(yd) - log(steady_state(yd))); //* +interest = 4*(log(R) - log(steady_state(R))); //* +inflation = 1*(log(PI) + log(PI(-1)) + log(PI(-2)) + log(PI(-3)) - 4*log(steady_state(PI))); //* +inflationq = 4*(log(PI) - log(steady_state(PI))); //* +outputgap = 1*(log(yd) - log(ydf) - (log(steady_state(yd)) - log(steady_state(ydf)))); +output = 1*(log(yd) - log(steady_state(yd))); //* //fispol = epsG; //* //************************************************************************** diff --git a/static/mmci-cli/models/US_FV15/US_FV15.mod b/static/mmci-cli/models/US_FV15/US_FV15.mod index 68980cdb..e57e9482 100644 --- a/static/mmci-cli/models/US_FV15/US_FV15.mod +++ b/static/mmci-cli/models/US_FV15/US_FV15.mod @@ -227,11 +227,11 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables//* //* -interest = 400*(log(R) - log(steady_state(R))); //* -inflation = 100*(log(PI) + log(PI(-1)) + log(PI(-2)) + log(PI(-3)) - 4*log(steady_state(PI))); //* -inflationq = 400*(log(PI) - log(steady_state(PI))); //* -outputgap = 100*(log(yd) - log(ydf) - (log(steady_state(yd)) - log(steady_state(ydf)))); -output = 100*(log(yd) - log(steady_state(yd))); //* +interest = 4*(log(R) - log(steady_state(R))); //* +inflation = 1*(log(PI) + log(PI(-1)) + log(PI(-2)) + log(PI(-3)) - 4*log(steady_state(PI))); //* +inflationq = 4*(log(PI) - log(steady_state(PI))); //* +outputgap = 1*(log(yd) - log(ydf) - (log(steady_state(yd)) - log(steady_state(ydf)))); +output = 1*(log(yd) - log(steady_state(yd))); //* //fispol = epsG; //* //************************************************************************** diff --git a/static/mmci-cli/models/US_IN10/US_IN10.json b/static/mmci-cli/models/US_IN10/US_IN10.json index 6d9e706c..7c72a2bd 100644 --- a/static/mmci-cli/models/US_IN10/US_IN10.json +++ b/static/mmci-cli/models/US_IN10/US_IN10.json @@ -64,7 +64,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -447,4 +447,4 @@ "text": "zkhf" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/US_IN10/US_IN10.mod b/static/mmci-cli/models/US_IN10/US_IN10.mod index 40b69270..47a76f5e 100644 --- a/static/mmci-cli/models/US_IN10/US_IN10.mod +++ b/static/mmci-cli/models/US_IN10/US_IN10.mod @@ -166,13 +166,13 @@ model ; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables //* -interest = 400*(r-log(1/BETA)); -inflation = (dp+dp(-1)+dp(-2)+dp(-3))*100; -inflationq = dp*400; -%outputgap = (Y -Yf)*100; -%output = (Y-0.9308)*100; -outputgap = (zata_GDP-zata_GDPf)*100; -output = (zata_GDP-0.9308)*100; +interest = 4*(r-log(1/BETA)); +inflation = (dp+dp(-1)+dp(-2)+dp(-3))*1; +inflationq = dp*4; +%outputgap = (Y -Yf)*1; +%output = (Y-0.9308)*1; +outputgap = (zata_GDP-zata_GDPf)*1; +output = (zata_GDP-0.9308)*1; //************************************************************************** //************************************************************************** // Policy Rule //* diff --git a/static/mmci-cli/models/US_VMDno/US_VMDno.json b/static/mmci-cli/models/US_VMDno/US_VMDno.json index b541e892..e6e97fc6 100644 --- a/static/mmci-cli/models/US_VMDno/US_VMDno.json +++ b/static/mmci-cli/models/US_VMDno/US_VMDno.json @@ -65,7 +65,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -416,4 +416,4 @@ "text": "YU" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/US_VMDno/US_VMDno.mod b/static/mmci-cli/models/US_VMDno/US_VMDno.mod index 821d08e3..ba030877 100644 --- a/static/mmci-cli/models/US_VMDno/US_VMDno.mod +++ b/static/mmci-cli/models/US_VMDno/US_VMDno.mod @@ -112,11 +112,11 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables//* -interest = 100*( (1+ReXU)^4 - (1+ReXUU)^4 )/((1+ReXUU)^4); //* +interest = 1*( (1+ReXU)^4 - (1+ReXUU)^4 )/((1+ReXUU)^4); //* inflation = 1/4*(inflationq+inflationq(-1)+inflationq(-2)+inflationq(-3));//* -inflationq = 100*(piU^4-piUU^4)/(piUU^4); //* -outputgap = 100*(YU-YflexU)/YUU; //* -output = 100*(YU-YUU)/YUU; //* +inflationq = 1*(piU^4-piUU^4)/(piUU^4); //* +outputgap = 1*(YU-YflexU)/YUU; //* +output = 1*(YU-YUU)/YUU; //* //************************************************************************** //************************************************************************** diff --git a/static/mmci-cli/models/US_VMDop/US_VMDop.json b/static/mmci-cli/models/US_VMDop/US_VMDop.json index 940a9a7a..d7cea5a1 100644 --- a/static/mmci-cli/models/US_VMDop/US_VMDop.json +++ b/static/mmci-cli/models/US_VMDop/US_VMDop.json @@ -65,7 +65,7 @@ "1", "0.25" ], - "variabledim": 2, + "variabledim": 1, "al": false, "shocks": [ { @@ -416,4 +416,4 @@ "text": "YU" } ] -} \ No newline at end of file +} diff --git a/static/mmci-cli/models/US_VMDop/US_VMDop.mod b/static/mmci-cli/models/US_VMDop/US_VMDop.mod index c6463b7e..51581e75 100644 --- a/static/mmci-cli/models/US_VMDop/US_VMDop.mod +++ b/static/mmci-cli/models/US_VMDop/US_VMDop.mod @@ -112,11 +112,11 @@ model; //************************************************************************** // Definition of Modelbase Variables in Terms of Original Model Variables//* -interest = 100*( (1+ReXU)^4 - (1+ReXUU)^4 )/((1+ReXUU)^4); //* +interest = 1*( (1+ReXU)^4 - (1+ReXUU)^4 )/((1+ReXUU)^4); //* inflation = 1/4*(inflationq+inflationq(-1)+inflationq(-2)+inflationq(-3));//* -inflationq = 100*(piU^4-piUU^4)/(piUU^4); //* -outputgap = 100*(YU-YflexU)/YUU; //* -output = 100*(YU-YUU)/YUU; //* +inflationq = 1*(piU^4-piUU^4)/(piUU^4); //* +outputgap = 1*(YU-YflexU)/YUU; //* +output = 1*(YU-YUU)/YUU; //* //************************************************************************** //**************************************************************************