update subjective solution objective simulation

econ-ark · Mar 6, 2024 · bea107e · bea107e
1 parent e798721
commit bea107e
Show file tree

Hide file tree

Showing 9 changed files with 481 additions and 1,304 deletions.
diff --git a/code/IndShock.ipynb b/code/IndShock.ipynb
diff --git a/code/Portfolio.ipynb b/code/Portfolio.ipynb
diff --git a/code/notebooks/SCF_notebook.ipynb → code/SCF_notebook.ipynb b/code/notebooks/SCF_notebook.ipynb → code/SCF_notebook.ipynb
diff --git a/code/estimark/estimation.py b/code/estimark/estimation.py
@@ -194,6 +194,17 @@ def simulate_moments(params, agent, agent_name):
     # Update the agent with a new path of DiscFac based on this DiscFacAdj (and a new CRRA)
     agent.DiscFac = [b * DiscFacAdj for b in options["timevary_DiscFac"]]
     agent.CRRA = CRRA
+
+    if "(Stock)" in agent_name and "Portfolio" in agent_name:
+        agent.RiskyAvg = init_subjective_stock["RiskyAvg"]
+        agent.RiskyStd = init_subjective_stock["RiskyStd"]
+        agent.update_RiskyDstn()
+
+    if "(Labor)" in agent_name:
+        agent.TranShkStd = init_subjective_labor["TranShkStd"]
+        agent.PermShkStd = init_subjective_labor["PermShkStd"]
+        agent.update_income_process()
+
     # if hasattr(agent, "BeqCRRA"):
     #     agent.BeqCRRA = [CRRA] * len(options["timevary_DiscFac"])
     # Solve the model for these parameters, then simulate wealth data
@@ -206,6 +217,8 @@ def simulate_moments(params, agent, agent_name):
         agent.RiskyAvg = agent.RiskyAvgTrue
         agent.RiskyStd = agent.RiskyStdTrue
         agent.update_RiskyDstn()
+
+    # TODO: use perceived for simulation too
     if "(Labor)" in agent_name:
         agent.TranShkStd = init_consumer_objects["TranShkStd"]
         agent.PermShkStd = init_consumer_objects["PermShkStd"]

diff --git a/code/estimark/parameters.py b/code/estimark/parameters.py
@@ -53,7 +53,7 @@
 
 # Income
 ss_variances = True
-income_spec = CGM_income["HS"]
+income_spec = CGM_income["HS"]  # College?
 # Replace retirement age
 income_spec["age_ret"] = retirement_age
 inc_calib = parse_income_spec(