From 3ce318f4bb69882ab787058d68de710ee96cff29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Argos=29?= Date: Thu, 12 Oct 2023 17:55:09 +0200 Subject: [PATCH] Remove commented lines. --- Q3_steadystate.m | 92 ++---------------------------------------------- 1 file changed, 3 insertions(+), 89 deletions(-) diff --git a/Q3_steadystate.m b/Q3_steadystate.m index 9b3d4aa..ff8a1fa 100644 --- a/Q3_steadystate.m +++ b/Q3_steadystate.m @@ -12,27 +12,18 @@ if isempty(DDYN), DDYN=1; end E_EX_RW = E_EX_INOMW - GPW0; E_EX_R = 1/BETAE-1; -% if SIMFLAG==0, E_EX_RW = E_EX_R; E_EX_INOMW = E_EX_RW + GPW0; -% end GTFP0 = (ALPHAE+ALPHAGE-1)/ALPHAE*GY0-(2-ALPHAE-ALPHAGE)/ALPHAE*GPCPI0; GYW0 = GY0; -% DELTAKE = (DELTAE+GPOP0)/(1+GPOP0); -% DELTAKGE = (DELTAGE+GPOP0)/(1+GPOP0); DELTAKE = (DELTAE+GPOP0); DELTAKGE = (DELTAGE+GPOP0); M_.params(strcmp('E_EX_RW', M_.param_names)) = E_EX_RW; M_.params(strcmp('GYW0', M_.param_names)) = GYW0; M_.params(strcmp('GTFP0', M_.param_names)) = GTFP0; -% end; -%SE=0.5*(SESUM+SEDIFF); SWE=SE; E_ETA =(1-TAUE); -% E_DEPRAT = DEPRAT0; -% E_DEPRAT1 = DEPRAT0; -% E_DEPRAT2 = DEPRAT0; E_GC = GY0; E_GCL = GY0+GPOP0; E_GCLC = GY0; @@ -66,7 +57,6 @@ E_GYW=GYW0; E_INOM = E_EX_R+GP0; E_INOMW =E_EX_INOMW; E_LOL = 0; -% E_NPART = NPART0; E_BWRY = (E_EX_RW - E_EX_R)/RPREME; TBYN = (-E_INOM+GPOP0+GP0+GY0)*E_BWRY; E_TBYN=TBYN; @@ -74,9 +64,6 @@ E_LYWY = LYWY0; M_.params(strcmp('LYWY0', M_.param_names)) = LYWY0; YWY = exp(LYWY0); -% E_LIK = log(DELTAKE+GY0+GPCPI0)-(GY0+GPCPI0); -% E_LIKG = log(DELTAKGE+GY0+GPCPI0)-(GY0+GPCPI0); -% IK = (DELTAKE+GY0+GPCPI0)/exp(GY0+GPCPI0); E_LIK = log(DELTAKE+GY0+GPCPI0); E_LIKG = log(DELTAKGE+GY0+GPCPI0); IK = (DELTAKE+GY0+GPCPI0); @@ -90,69 +77,22 @@ else M_.params(strcmp('ISN', M_.param_names)) = ISN; end -% if SIMFLAG == 1, -% UCAP0 = (1-TAUE)*(1-ALPHAE)*exp(E_LYKPPI)/A1E; -% set_param_value('UCAP0',UCAP0); -% % assignin('base','UCAP0',UCAP0); -% % M_.params(strmatch('UCAP0',M_.param_names,'exact')) = UCAP0; -% set_param_value('SIMFLAG',-1); -% if abs(E_EX_RW - E_EX_R)<1.e-8, -% pname={'L0'}; -% eqind=10; -% % L0 = fzero(@(x) quest1_steadystate_util(x, pname, eqind),L0); -% L0 = fzero(@(x) quest1_steadystate_util(x, pname),L0); -% LER0=0; -% else -% while abs(quest1_steadystate_util)>options_.dynatol, -% pname={'L0'}; -% eqind=10; -% L0 = fzero(@(x) quest1_steadystate_util(x, pname, eqind),L0); -% pname={'LER0'}; -% eqind=30; -% LER0 = fzero(@(x) quest1_steadystate_util(x, pname, eqind),LER0); -% end -% % if quest1_steadystate_util>options_.dynatol, -% % opt=optimset('fminsearch'); -% % % opt.Display='iter'; -% % opt.TolX=1.e-4; -% % opt.TolFun=1.e-4; -% % opt.MaxFunEvals=1000; -% % pname={'L0','LER0'}; -% % xx = fminsearch(@(x) quest1_steadystate_util(x, pname),[L0; LER0],opt); -% % % xx = dynare_solve('quest1_steadystate_util',[L0 LER0],0,{'L0','LER0'},[10 30]); -% % -% % L0=xx(1); -% % LER0=xx(2); -% % end -% set_param_value('LER0',LER0); -% end -% set_param_value('L0',L0); -% set_param_value('SIMFLAG',1); -% -% -% end + E_L =L0; E_LL =log(L0); E_LL0 =log(L0); -% if SIMFLAG==0 | abs(E_EX_RW - E_EX_R)<1.e-8, - LER0=0; -% end +LER0=0; E_ER=exp(LER0); E_LER = LER0; PMP = (E_ER^ALPHAX); E_LPMP = log(PMP); -%PCP = PMP^(1-SE); PCP = (SE+(1-SE)*PMP^(1-SIGIME))^(1/(1-SIGIME)); E_LPCP= log(PCP); -%E_LPCP = (1-SE)*E_LPMP - SE*(1-SE)*E_LPMP^2*(SIGIME-1)/2; -%PCP=exp(E_LPCP); E_LPCPM0 = E_LPCP-E_LPMP; PXP = 1; %PCP^(S0*(1-SXDE)); E_LPXP = 0; %(1-SXDE)*S0*E_LPCP; -% E_LIMYN = log(1-SE); -% E_LEXYN = log(1-SWE); IMYN = (1-SE)*exp(E_LPCP-E_LPMP)^(SIGIME-1)*(1-TBYN); E_LIMYN = log(IMYN); @@ -173,9 +113,6 @@ YWR = 1/((1-TAUE)*ALPHAE/L0*(1+E_LOL)) ; E_LYWR = log(YWR) ; E_LWPTU = 0; E_TW = 0.2; -%E_TW=TW0*(E_WPTU)^TW1; - -% TW0=E_TW/(E_WPTU)^TW1; M_.params(strcmp('TW0', M_.param_names)) = TW0; E_TRW = TRSN; @@ -189,9 +126,7 @@ CNLCSN = (CSN-CLCSN*SLC*SLCFLAG)/(1-SLC*SLCFLAG); E_LCNLCSN = log(CNLCSN); UCTERM = ((1-SLCFLAG*SLC)*(CNLCSN*(1-HABE))^(-SIGC)+SLCFLAG*SLC*CLCSN^(-SIGC))/((1-SLCFLAG*SLC)*(CNLCSN*(1-HABE))^(1-SIGC)+SLCFLAG*SLC*CLCSN^(1-SIGC)); A = (THETAE-1)/THETAE*(1-E_TW-SSC)/(1+TVAT)*E_WS*UCTERM/L0; -% if SIMFLAG==0, - OMEGE = A/(KAPPAE*(L0*(1-HABLE))^(KAPPAE-1)+A*(L0*(1-HABLE))^KAPPAE); -% end +OMEGE = A/(KAPPAE*(L0*(1-HABLE))^(KAPPAE-1)+A*(L0*(1-HABLE))^KAPPAE); UCYN = (CNLCSN*(1-HABE))^(-SIGC)*(1-OMEGE*(L0*(1-HABLE))^KAPPAE)^(1-SIGC); E_LUCYN = log(UCYN); UCLCYN = (CLCSN)^(-SIGC)*(1-OMEGE*(L0*(1-HABLE))^KAPPAE)^(1-SIGC); @@ -277,24 +212,3 @@ if DDYN==0 end params = M_.params; - -%PAR1 = 1/((1-TP)*(1/exp(E_LISN)-(1/exp(E_LISN))*(1/exp(E_LYWR))- SHCRED*E_INOM*exp(E_LIK))); -%PAR1 = exp(E_LIK)/((1-TP)*(exp(E_LYKPPI) -exp(E_LYKPPI)/exp(E_LYWR)-SHCRED*(E_INOM+RPREMK))); -%M_.params(strmatch('PAR1',M_.param_names,'exact')) = PAR1; - -% exs = M_.exo_nbr; -% ex_ = zeros(1,exs); -% -% [fmax, iff] = max(abs(quest1_static(ys, ex_, M_.params))); -% -% if fmax>1.e-8; %options_.dynatol; -% disp(['The analytic steady state is not correct! ',num2str(fmax)]) -% disp(['Equation ',int2str(iff),', discrepancy ',num2str(fmax)]) -% check1=1; -% end - -% if SIMFLAG==1, -% exs = M_.exo_nbr; -% ex_ = zeros(1,exs); -% disp(num2str(max(abs( quest1_static(ys, ex_, M_.params))))), -% end