Skip to content

Commit

Permalink
Whoops, that's better
Browse files Browse the repository at this point in the history
  • Loading branch information
DominicWC committed Aug 21, 2024
1 parent 9b23247 commit 4b7f2e7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion HARK/ConsumptionSaving/ConsLaborModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ class LaborIntMargConsumerType(IndShockConsumerType):
b_{t+1} &= a_t \Rfree_{t+1}/(\PermGroFac_{t+1} \psi_{t+1}), \\
(\psi_{t+1},\theta_{t+1}) &\sim F_{t+1}, \\
\mathbb{E}[\psi]=\mathbb{E}[\theta] &= 1, \\
u_{t}(c,L) &= \frac{(c (1-L)^{\alpha_t})^{1-\CRRA}}{1-\CRRA}
u_{t}(c,L) &= \frac{(c (1-L)^{\alpha_t})^{1-\CRRA}}{1-\CRRA} \\
\end{align*}
Expand Down
4 changes: 2 additions & 2 deletions HARK/ConsumptionSaving/ConsPrefShockModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ class PrefShockConsumerType(IndShockConsumerType):
m_{t+1} &= a_t \Rfree_{t+1}/(\PermGroFac_{t+1} \psi_{t+1}) + \theta_{t+1}, \\
(\psi_{t+1},\theta_{t+1},\eta_{t+1}) &\sim F_{t+1}, \\
\mathbb{E}[\psi]=\mathbb{E}[\theta] &= 1, \\
u(c) &= \frac{c^{1-\CRRA}}{1-\CRRA}
u(c) &= \frac{c^{1-\CRRA}}{1-\CRRA} \\
\end{align*}
Expand Down Expand Up @@ -537,7 +537,7 @@ class KinkyPrefConsumerType(PrefShockConsumerType, KinkedRconsumerType):
\end{cases}\\
\Rfree_{boro} &> \Rfree_{save}, \\
(\psi_{t+1},\theta_{t+1},\eta_{t+1}) &\sim F_{t+1}, \\
\mathbb{E}[\psi]=\mathbb{E}[\theta] &= 1.
\mathbb{E}[\psi]=\mathbb{E}[\theta] &= 1. \\
u(c) &= \frac{c^{1-\CRRA}}{1-\CRRA} \\
\end{align*}
Expand Down
6 changes: 4 additions & 2 deletions HARK/ConsumptionSaving/ConsRiskyAssetModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ def make_simple_ShareGrid(ShareCount):
}
# Risky return factor moments are based on SP500 real returns from Shiller's
# "chapter 26" data, which can be found at https://www.econ.yale.edu/~shiller/data.htm
# Access it through the internet archive
# We've (will) rounded them to the nearest .01

# Default parameters to make RiskyDstn with make_simple_ShareGrid
IndShockRiskyAssetConsumerType_ShareGrid_default = {
Expand Down Expand Up @@ -194,7 +196,7 @@ class IndShockRiskyAssetConsumerType(IndShockConsumerType):
m_{t+1} &= \mathsf{R}_{t+1}/(\PermGroFac_{t+1} \psi_{t+1}) a_t + \theta_{t+1}, \\
\mathsf{R}_{t+1} &=S_t\phi_{t+1}\mathbf{R}_{t+1}+ (1-S_t)\mathsf{R}_{t+1}, \\
(\psi_{t+1},\theta_{t+1},\phi_{t+1}) &\sim F_{t+1}, \\
\mathbb{E}[\psi]=\mathbb{E}[\theta] &= 1.
\mathbb{E}[\psi]=\mathbb{E}[\theta] &= 1. \\
u(c) &= \frac{c^{1-\CRRA}}{1-\CRRA} \\
\end{align*}
Expand Down Expand Up @@ -660,7 +662,7 @@ class FixedPortfolioShareRiskyAssetConsumerType(IndShockRiskyAssetConsumerType):
m_{t+1} &= \mathsf{R}_{t+1}/(\PermGroFac_{t+1} \psi_{t+1}) a_t + \theta_{t+1}, \\
\mathsf{R}_{t+1} &=S_t\phi_{t+1}\mathbf{R}_{t+1}+ (1-S_t)\mathsf{R}_{t+1}, \\
(\psi_{t+1},\theta_{t+1},\phi_{t+1}) &\sim F_{t+1}, \\
\mathbb{E}[\psi]=\mathbb{E}[\theta] &= 1.
\mathbb{E}[\psi]=\mathbb{E}[\theta] &= 1. \\
u(c) &= \frac{c^{1-\CRRA}}{1-\CRRA} \\
\end{align*}
Expand Down

0 comments on commit 4b7f2e7

Please sign in to comment.