Skip to content

Commit

Permalink
organize source
Browse files Browse the repository at this point in the history
  • Loading branch information
alanlujan91 committed Nov 27, 2024
1 parent 0e51243 commit ae62e72
Show file tree
Hide file tree
Showing 149 changed files with 5,969 additions and 5,969 deletions.
2 changes: 1 addition & 1 deletion _toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ root: README
chapters:
- title: Paper
sections:
- file: content/paper/01-paper
- file: docs/paper/01-paper
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions myst.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ project:
url: https://advanced.jhu.edu
- econ-ark
github: https://github.com/alanlujan91/TRP-wealth-in-utility
bibliography: content/references.bib
bibliography: docs/references.bib
license:
content: CC-BY-4.0
code: MIT
toc:
# Auto-generated by `myst init --write-toc`
- file: content/life-cycle-prime-time.md
- file: content/synopsis.md
- file: content/lit_review.md
- file: docs/life-cycle-prime-time.md
- file: docs/synopsis.md
- file: docs/lit_review.md
math:
'\CARA': '\alpha'
'\CRRA': '\rho'
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions src/do_all.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def run_replication():
else:
print("Invalid replication choice.")
return

if subjective_markets == "":
subjective_markets = "1"
if int(subjective_markets) > 1:
Expand All @@ -153,7 +153,7 @@ def run_replication():
agent_name += "Market"

replication_specs["agent_name"] = agent_name
replication_specs["save_dir"] = "content/tables/min"
replication_specs["save_dir"] = "docs/tables/min"

estimate(**replication_specs)

Expand Down
10 changes: 5 additions & 5 deletions src/estimark/estimation.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def make_agent(agent_name):
track_vars += ["Share"]
agent.track_vars = track_vars
if "WarmGlow" in agent_name:
agent.BeqMPC = 1.0 # dummy value
agent.BeqMPC = 1.0 # dummy value
agent.BeqInt = 1.0

agent.name = agent_name
Expand Down Expand Up @@ -251,13 +251,13 @@ def simulate_moments(params, agent=None, emp_moments=None):
agent.TranShkStd = init_subjective_labor["TranShkStd"]
agent.PermShkStd = init_subjective_labor["PermShkStd"]
agent.update_income_process()

# Update parameters on the agent / construct them
agent.update()
if "WarmGlow" in agent.name:
agent.BeqFac = agent.BeqMPC**(-agent.CRRA)
agent.BeqFac = agent.BeqMPC ** (-agent.CRRA)
agent.BeqShift = agent.BeqInt / agent.BeqMPC

# Solve the model for these parameters, then simulate wealth data
agent.solve() # Solve the microeconomic model

Expand Down Expand Up @@ -897,7 +897,7 @@ def estimate(
local_compute_sensitivity = False
# Whether to make a contour map of the objective function
local_make_contour_plot = False
local_save_dir = "content/tables/min"
local_save_dir = "docs/tables/min"

estimate(
agent_name=local_agent_name,
Expand Down
1,496 changes: 748 additions & 748 deletions src/msm_notebooks/MSM Full Bequest model.ipynb

Large diffs are not rendered by default.

1,272 changes: 636 additions & 636 deletions src/msm_notebooks/MSM LCIM model.ipynb

Large diffs are not rendered by default.

1,270 changes: 635 additions & 635 deletions src/msm_notebooks/MSM TRP model.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/msm_notebooks/MSM Term Bequest model.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"from HARK.ConsumptionSaving.ConsIndShockModel import init_lifecycle\n",
"from HARK.utilities import plot_funcs\n",
"\n",
"figs_dir = Path(\"../../content/slides/figures/\")\n",
"figs_dir = Path(\"../../docs/slides/figures/\")\n",
"figs_dir.mkdir(parents=True, exist_ok=True)"
]
},
Expand Down
1,546 changes: 773 additions & 773 deletions src/msm_notebooks/MSM Warm Glow Bequest model.ipynb

Large diffs are not rendered by default.

1,230 changes: 615 additions & 615 deletions src/msm_notebooks/NetWorth_Cov.ipynb

Large diffs are not rendered by default.

2,044 changes: 1,022 additions & 1,022 deletions src/msm_notebooks/savres.ipynb

Large diffs are not rendered by default.

388 changes: 194 additions & 194 deletions src/notebooks/IndShock.ipynb

Large diffs are not rendered by default.

674 changes: 337 additions & 337 deletions src/notebooks/Model_Comparisons.ipynb

Large diffs are not rendered by default.

560 changes: 280 additions & 280 deletions src/notebooks/Portfolio.ipynb

Large diffs are not rendered by default.

352 changes: 176 additions & 176 deletions src/notebooks/WarmGlow.ipynb

Large diffs are not rendered by default.

478 changes: 239 additions & 239 deletions src/notebooks/WarmGlowPortfolio.ipynb

Large diffs are not rendered by default.

594 changes: 297 additions & 297 deletions src/notebooks/WealthPortfolio.ipynb

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/notebooks/parse_tables.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"metadata": {},
"outputs": [],
"source": [
"csv_file_dir = Path(\"../../content/tables/TRP/\")\n",
"csv_file_dir = Path(\"../../docs/tables/TRP/\")\n",
"params_to_keep = set(\n",
" [\"CRRA\", \"BeqFac\", \"BeqShift\", \"WealthShare\", \"WealthShift\", \"criterion\"],\n",
")\n",
Expand Down Expand Up @@ -166,7 +166,7 @@
"metadata": {},
"outputs": [],
"source": [
"formatted_df.to_latex(\"../../content/tables/parameters.tex\", index=False)"
"formatted_df.to_latex(\"../../docs/tables/parameters.tex\", index=False)"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/run_all.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def run_replication():

replication_specs = low_resource.copy()
replication_specs["agent_name"] = temp_agent_name
replication_specs["save_dir"] = "content/tables/TRP"
replication_specs["save_dir"] = "docs/tables/TRP"

print("Model: ", replication_specs["agent_name"])

Expand Down
2 changes: 1 addition & 1 deletion src/run_all_msm.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def run_replication():

replication_specs = low_resource.copy()
replication_specs["agent_name"] = temp_agent_name
replication_specs["save_dir"] = "content/tables/msm"
replication_specs["save_dir"] = "docs/tables/msm"

print("Model: ", replication_specs["agent_name"])

Expand Down

0 comments on commit ae62e72

Please sign in to comment.