Skip to content

Commit 040778d

Browse files
jonswarbrickjonswarbrick
committed
Amend endogenous Omega
1 parent 4a7fbf5 commit 040778d

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎AlternativeVersions/9_2withEndogenousOmega/DynamicSpatialModel.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ model;
197197
* ( E@{Index1} / N@{Index1}_LAG ) ^ thetaF
198198
* ( ( 1 - L@{Index1} ) / N@{Index1}_LAG ) ^ thetaL
199199
* ( 1 / ( 1 + nu ) * Gamma ^ ( 1 + nu ) - 1 / ( 1 + nu ) * ( HT@{Index1} / N@{Index1}_LAG ) ^ ( 1 + nu ) ) ^ thetaH
200-
* ( ( Omega@{Index1}_LAG - N@{Index1}_LAG ) / N_LAG ) ^ thetaN
200+
* ( Omega@{Index1}_LAG / N@{Index1}_LAG - 1 ) ^ thetaN //* ( ( Omega@{Index1}_LAG - N@{Index1}_LAG ) / N_LAG ) ^ thetaN
201201
* ( 1 - SN@{Index1} / N@{Index1}_LAG ) ^ psi1
202202
* ( dBar - SD@{Index1} / SN@{Index1} ) ^ psi2
203203
* exp( psi3 * ( 0
@@ -210,7 +210,7 @@ model;
210210
[name = 'muN@{Index1}']
211211
muN@{Index1} = beta * ( muN@{Index1}_LEAD * GN_LEAD + U@{Index1}_LEAD ^ ( 1 - varsigma ) + ( 1 - varsigma ) * U@{Index1}_LEAD ^ ( 1 - varsigma ) * (
212212
thetaH * ( HT@{Index1}_LEAD / N@{Index1} ) ^ ( 1 + nu ) / ( 1 / ( 1 + nu ) * Gamma ^ ( 1 + nu ) - 1 / ( 1 + nu ) * ( HT@{Index1}_LEAD / N@{Index1} ) ^ ( 1 + nu ) )
213-
- thetaN * N@{Index1} / ( Omega@{Index1} - N@{Index1} )
213+
- thetaN * Omega@{Index1} / ( Omega@{Index1} - N@{Index1} ) // - thetaN * N@{Index1} / ( Omega@{Index1} - N@{Index1} )
214214
+ psi1 * SN@{Index1}_LEAD / ( N@{Index1} - SN@{Index1}_LEAD )
215215
- ( thetaC + thetaF + thetaL + psi3 )
216216
) );
@@ -405,7 +405,7 @@ end;
405405
Pi_1_ = lambda / ( 1 + lambda ) * ( 1 + lambda ) ^ ( - 1 / lambda ) * SP_1_ ^ ( - 1 / lambda ) * YBar_1_;
406406
J_1_ = ( ( 1 + lambda ) * SP_1_ * AverageTransportCost_ / P_1_ ) ^ ( 1 / lambda );
407407
E_1_ = F_1_;
408-
QD_1_ = ( 1 - PhiD * ( 1 - GN_ )^2 / 2 + PhiD * ( 1 - GN_ ) * GN_ - Xi_LEAD_ * GWTrend_ * PhiD * ( 1 - GN_ ) * GN_^2 )^(-1);
408+
QD_1_ = ( 1 - PhiD * ( 1 - GN_ )^2 / 2 + PhiD * ( 1 - GN_ ) * GN_ - Xi_LEAD_ * GWTrend_ * PhiD * ( 1 - GN_ ) * GN_^2 )^(-1);
409409
Omega_1_ = N_1_ + phiD * Xi_LEAD_ * GFTrend_ * ( E_1_ / W_1_ ) * ( thetaN / thetaF ) / ( QD_1_ - Xi_LEAD_ * GWTrend_ * ( 1 - deltaD ) * QD_1_ );
410410
HD_1_ = Omega_1_ * ( 1 - (1-deltaD)/GN_ ) / ( phiD * ( 1 - (PhiD/2) * ( 1 - GN_ )^2 ) );
411411
HT_1_ = H_1_ + HD_1_;
@@ -426,7 +426,7 @@ end;
426426
427427
U_1_LEAD_ = U_1_ * GUTrend_;
428428
HT_1_LEAD_ = HT_1_ * GN_;
429-
muN_1_ = beta_ * ( U_1_LEAD_ ^ ( 1 - varsigma ) + ( 1 - varsigma ) * U_1_LEAD_ ^ ( 1 - varsigma ) * ( thetaH * ( HT_1_LEAD_ / N_1_ ) ^ ( 1 + nu ) / ( 1 / ( 1 + nu ) * Gamma ^ ( 1 + nu ) - 1 / ( 1 + nu ) * ( HT_1_LEAD_ / N_1_ ) ^ ( 1 + nu ) ) - thetaN * N_1_ / ( Omega_1_ - N_1_ ) + psi1 * SN_1_ * GN_ / ( N_1_ - SN_1_ * GN_ ) - ( thetaC + thetaF + thetaL + psi3 ) ) ) / ( 1 - beta_ * GmuNTrend_ * GN_ );
429+
muN_1_ = beta_ * ( U_1_LEAD_ ^ ( 1 - varsigma ) + ( 1 - varsigma ) * U_1_LEAD_ ^ ( 1 - varsigma ) * ( thetaH * ( HT_1_LEAD_ / N_1_ ) ^ ( 1 + nu ) / ( 1 / ( 1 + nu ) * Gamma ^ ( 1 + nu ) - 1 / ( 1 + nu ) * ( HT_1_LEAD_ / N_1_ ) ^ ( 1 + nu ) ) - thetaN * Omega_1_ / ( Omega_1_ - N_1_ ) + psi1 * SN_1_ * GN_ / ( N_1_ - SN_1_ * GN_ ) - ( thetaC + thetaF + thetaL + psi3 ) ) ) / ( 1 - beta_ * GmuNTrend_ * GN_ );
430430
431431
@#for VariableName in AggregatedVariables
432432
@{VariableName}_ = @{VariableName}_1_;

‎AlternativeVersions/9_2withEndogenousOmega/GetF_1_.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
function F_1_ = GetF_1_( A_1_, GWTrend_, GFTrend_, GN_, N_1_, N_1_LAG_, nu, gamma, Gamma, L_1_, lambda, phi_, deltaJ, GJTrend_, AverageTransportCost_, thetaC, thetaF, thetaH, kappa, alpha, GYTrend_, GSRKTrend_, P_1_Over_Q_1_, Xi_LEAD_, deltaK, Phi2, GSPTrend_, PhiD, phiD, deltaD, thetaN )
22
global F_1_K_1_H_1_Q_1_
33
F_1_K_1_H_1_Q_1_ = exp( fsolve( @( log_F_1_K_1_H_1_Q_1_ ) GetResidual( exp( log_F_1_K_1_H_1_Q_1_ ), A_1_, GWTrend_, GFTrend_, GN_, N_1_, N_1_LAG_, nu, gamma, Gamma, L_1_, lambda, phi_, deltaJ, GJTrend_, AverageTransportCost_, thetaC, thetaF, thetaH, kappa, alpha, GYTrend_, GSRKTrend_, P_1_Over_Q_1_, Xi_LEAD_, deltaK, Phi2, GSPTrend_, PhiD, phiD, deltaD, thetaN ), ...
4-
log( [ 0.0756 0.3423 0.6247 7.6171 ] ), ...
4+
[ -3.17866 -2.30363 -1.5714 2.67453 ], ...log( [ 0.0756 0.3423 0.6247 7.6171 ] ), ...
55
optimoptions( @fsolve, 'Display', 'iter', 'FunctionTolerance', 1e-12, 'MaxFunctionEvaluations', Inf, 'MaxIterations', Inf, 'OptimalityTolerance', 1e-12, 'StepTolerance', 1e-12, 'UseParallel', false ) ) );
66
F_1_ = F_1_K_1_H_1_Q_1_( 1 );
77
disp( F_1_K_1_H_1_Q_1_ );

‎AlternativeVersions/9_2withEndogenousOmega/do_file.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
%% Solve model
99
if logical(run_single)
10-
param_thetaN = 20; %10
10+
param_thetaN = 1; %10
1111
param_Phi2 = 4; %4
1212
param_PhiL = 2; %2
1313
param_Omega = 3; %3
1414
param_zeta = 8; %8
1515
param_lambda = 0.1; %0.1
16-
param_PhiD = 4;
17-
param_phiD = 10;
18-
param_deltaD = 0.2;
16+
param_PhiD = 0;
17+
param_phiD = 100;
18+
param_deltaD = 1;
1919
save('param_vals.mat')
2020

2121
dynare DynamicSpatialModel

0 commit comments

Comments
 (0)