update slides

econ-ark · Jun 14, 2024 · bd8c71d · bd8c71d
1 parent 8028033
commit bd8c71d
Show file tree

Hide file tree

Showing 153 changed files with 46,027 additions and 633 deletions.
diff --git a/.gitignore b/.gitignore
@@ -149,3 +149,7 @@ cython_debug/
 .ipynb_checkpoints
 _build
 code/data/S&P Target Date glidepath.xlsx
+.Rproj.user
+*.Rproj
+*.Rhistory
+*.dta
diff --git a/EstimatingMicroDSOPs.Rproj b/EstimatingMicroDSOPs.Rproj
@@ -0,0 +1,13 @@
+Version: 1.0
+
+RestoreWorkspace: Default
+SaveWorkspace: Default
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: Sweave
+LaTeX: pdfLaTeX
diff --git a/code/estimark/agents.py b/code/estimark/agents.py
@@ -50,8 +50,8 @@ def simBirth(self, which_agents):
         # Which period of the cycle each agents is currently in
         self.t_cycle[which_agents] = 0
 
-### Overwrite sim_one_period to not have death or look up of agent ages
 
+### Overwrite sim_one_period to not have death or look up of agent ages
 
 
 class IndShkLifeCycleConsumerType(TempConsumerType, IndShockConsumerType):

diff --git a/code/estimark/estimation.py b/code/estimark/estimation.py
@@ -373,7 +373,7 @@ def msm_criterion(params, agent=None, emp_moments=None, weights=None):
         [
             float(weights[key] * (sim_moments[key] - emp_moments[key]))
             for key in emp_moments
-        ]
+        ],
     )
 
     squared_errors = np.square(errors)

diff --git a/code/estimark/parameters.py b/code/estimark/parameters.py
@@ -15,8 +15,8 @@
     Cagetti_income,
     parse_income_spec,
 )
+from HARK.Calibration.life_tables.us_ssa.SSATools import parse_ssa_life_table
 from HARK.ConsumptionSaving.ConsIndShockModel import init_lifecycle
-from HARK.datasets.life_tables.us_ssa.SSATools import parse_ssa_life_table
 from HARK.distribution import DiscreteDistribution
 
 # ---------------------------------------------------------------------------------

diff --git a/code/msm_notebooks/FinAssets_Cov.ipynb b/code/msm_notebooks/FinAssets_Cov.ipynb
diff --git a/code/msm_notebooks/MSM Full Bequest model.ipynb b/code/msm_notebooks/MSM Full Bequest model.ipynb
diff --git a/code/msm_notebooks/MSM LCIM model.ipynb b/code/msm_notebooks/MSM LCIM model.ipynb
diff --git a/code/msm_notebooks/MSM TRP model.ipynb b/code/msm_notebooks/MSM TRP model.ipynb
diff --git a/code/msm_notebooks/MSM Term Bequest model.ipynb b/code/msm_notebooks/MSM Term Bequest model.ipynb
diff --git a/code/msm_notebooks/MSM Warm Glow Bequest model.ipynb b/code/msm_notebooks/MSM Warm Glow Bequest model.ipynb
diff --git a/code/msm_notebooks/NetWorth_Cov.ipynb b/code/msm_notebooks/NetWorth_Cov.ipynb
diff --git a/code/msm_notebooks/beq_results.pkl b/code/msm_notebooks/beq_results.pkl
diff --git a/code/msm_notebooks/cis_results.pkl b/code/msm_notebooks/cis_results.pkl
diff --git a/code/msm_notebooks/finassets_cov.pkl b/code/msm_notebooks/finassets_cov.pkl
diff --git a/code/msm_notebooks/fullbeq_results.pkl b/code/msm_notebooks/fullbeq_results.pkl
diff --git a/code/msm_notebooks/lcim_results.pkl b/code/msm_notebooks/lcim_results.pkl
diff --git a/code/msm_notebooks/networth_cov.pkl b/code/msm_notebooks/networth_cov.pkl
diff --git a/code/msm_notebooks/networth_mom.pkl b/code/msm_notebooks/networth_mom.pkl
diff --git a/code/msm_notebooks/norm_networth_cov.pkl b/code/msm_notebooks/norm_networth_cov.pkl
diff --git a/code/msm_notebooks/norm_networth_mom.pkl b/code/msm_notebooks/norm_networth_mom.pkl
diff --git a/code/msm_notebooks/savres.ipynb b/code/msm_notebooks/savres.ipynb
diff --git a/code/msm_notebooks/termbeq_results.pkl b/code/msm_notebooks/termbeq_results.pkl
diff --git a/code/msm_notebooks/trp_results.pkl b/code/msm_notebooks/trp_results.pkl
diff --git a/code/msm_notebooks/wgbeq_results.pkl b/code/msm_notebooks/wgbeq_results.pkl
diff --git a/code/notebooks/IndShock.ipynb b/code/notebooks/IndShock.ipynb
@@ -6,11 +6,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import matplotlib.pyplot as plt\n",
+    "import pandas as pd\n",
     "from estimark.agents import IndShkLifeCycleConsumerType\n",
     "from estimark.parameters import init_calibration\n",
-    "from HARK.utilities import plot_funcs\n",
-    "import matplotlib.pyplot as plt\n",
-    "import pandas as pd"
+    "from HARK.utilities import plot_funcs"
    ]
   },
   {

diff --git a/code/notebooks/Model_Comparisons.ipynb b/code/notebooks/Model_Comparisons.ipynb
@@ -17,8 +17,7 @@
     "from estimark.estimation import get_weighted_moments\n",
     "from estimark.parameters import age_mapping, init_calibration\n",
     "from estimark.scf import scf_data\n",
-    "from estimark.snp import snp_data, snp_data_full\n",
-    "from HARK.utilities import plot_funcs"
+    "from estimark.snp import snp_data_full"
    ]
   },
   {

diff --git a/code/notebooks/Portfolio.ipynb b/code/notebooks/Portfolio.ipynb
@@ -6,13 +6,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from estimark.agents import PortfolioLifeCycleConsumerType\n",
-    "from estimark.parameters import init_calibration\n",
-    "from HARK.utilities import plot_funcs\n",
     "import matplotlib.pyplot as plt\n",
+    "import numpy as np\n",
     "import pandas as pd\n",
+    "from estimark.agents import PortfolioLifeCycleConsumerType\n",
+    "from estimark.parameters import init_calibration\n",
     "from estimark.snp import snp_data, snp_data_full\n",
-    "import numpy as np"
+    "from HARK.utilities import plot_funcs"
    ]
   },
   {

diff --git a/code/notebooks/SCF_notebook.ipynb b/code/notebooks/SCF_notebook.ipynb
@@ -6,10 +6,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from estimark.scf import scf_data_full\n",
-    "from estimark.parameters import age_mapping\n",
-    "from estimark.estimation import get_weighted_moments\n",
     "import matplotlib.pyplot as plt\n",
+    "from estimark.estimation import get_weighted_moments\n",
+    "from estimark.parameters import age_mapping\n",
+    "from estimark.scf import scf_data_full\n",
     "from statsmodels.stats.weightstats import DescrStatsW"
    ]
   },
@@ -621,7 +621,9 @@
    ],
    "source": [
     "scf_data_full.groupby([\"age_group\", \"wave\"]).apply(\n",
-    "    weighted_median, var=\"wealth_income_ratio\", weights=\"weight\"\n",
+    "    weighted_median,\n",
+    "    var=\"wealth_income_ratio\",\n",
+    "    weights=\"weight\",\n",
     ").unstack().plot()"
    ]
   },

diff --git a/code/notebooks/WarmGlow.ipynb b/code/notebooks/WarmGlow.ipynb
diff --git a/code/notebooks/WarmGlowPortfolio.ipynb b/code/notebooks/WarmGlowPortfolio.ipynb
diff --git a/code/notebooks/WealthPortfolio.ipynb b/code/notebooks/WealthPortfolio.ipynb
@@ -6,13 +6,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from estimark.agents import WealthPortfolioLifeCycleConsumerType\n",
-    "from estimark.parameters import init_calibration\n",
-    "from HARK.utilities import plot_funcs\n",
     "import matplotlib.pyplot as plt\n",
+    "import numpy as np\n",
     "import pandas as pd\n",
+    "from estimark.agents import WealthPortfolioLifeCycleConsumerType\n",
+    "from estimark.parameters import init_calibration\n",
     "from estimark.snp import snp_data, snp_data_full\n",
-    "import numpy as np"
+    "from HARK.utilities import plot_funcs"
    ]
   },
   {
@@ -154,9 +154,8 @@
    "outputs": [],
    "source": [
     "from estimark.estimation import get_weighted_moments\n",
-    "from estimark.scf import scf_data\n",
     "from estimark.parameters import age_mapping\n",
-    "\n",
+    "from estimark.scf import scf_data\n",
     "\n",
     "moments = get_weighted_moments(\n",
     "    data=scf_data,\n",

diff --git a/code/notebooks/parse_tables.ipynb b/code/notebooks/parse_tables.ipynb
@@ -7,6 +7,7 @@
    "outputs": [],
    "source": [
     "from pathlib import Path\n",
+    "\n",
     "import pandas as pd"
    ]
   },
@@ -18,7 +19,7 @@
    "source": [
     "csv_file_dir = Path(\"../../content/tables/TRP/\")\n",
     "params_to_keep = set(\n",
-    "    [\"CRRA\", \"BeqFac\", \"BeqShift\", \"WealthShare\", \"WealthShift\", \"criterion\"]\n",
+    "    [\"CRRA\", \"BeqFac\", \"BeqShift\", \"WealthShare\", \"WealthShift\", \"criterion\"],\n",
     ")\n",
     "\n",
     "# Get all files in the directory\n",
@@ -144,8 +145,7 @@
     "\n",
     "\n",
     "# Define the order of columns\n",
-    "column_order = [\"Name\", \"criterion\", \"CRRA\",\n",
-    "                \"WealthShare\", \"BeqFac\", \"BeqShift\"]\n",
+    "column_order = [\"Name\", \"criterion\", \"CRRA\", \"WealthShare\", \"BeqFac\", \"BeqShift\"]\n",
     "\n",
     "df = pd.DataFrame(parameters)\n",
     "formatted_df = format_df(df)[column_order].sort_index()\n",

diff --git a/content/slides/_extensions/grantmcdermott/clean/_extension.yml b/content/slides/_extensions/grantmcdermott/clean/_extension.yml
@@ -0,0 +1,13 @@
+title: clean
+author: Grant McDermott
+version: 1.0.0
+quarto-required: ">=1.3.0"
+contributes:
+  formats:
+    revealjs:
+      theme: [default, clean.scss]
+      menu:
+        side: left
+      slide-number: true
+      date-format: long
+
-Original file line number
+Diff line change
@@ Expand Up @@
             [
                 float(weights[key] * (sim_moments[key] - emp_moments[key]))
                 for key in emp_moments
-            ]
+            ],
         )
         squared_errors = np.square(errors)
@@ Expand Down @@