example notebooks

Notebooks featuring the bequest portfolio consumer type almost complete. There is a minor issue in the notebooks: for some reason, the accidental and terminal bequest portfolio types are returning the same consumption functions and wealth moments. This obviously should not occur, since the dictionary creates instances with different parameter values.
dedwar65 · Mar 28, 2024 · ae0358e · ae0358e
1 parent 63e8bb1
commit ae0358e
Show file tree

Hide file tree

Showing 5 changed files with 192 additions and 188 deletions.
diff --git a/HARK/ConsumptionSaving/ConsBequestModel.py b/HARK/ConsumptionSaving/ConsBequestModel.py
@@ -10,27 +10,18 @@
 """
 
 import numpy as np
+
 from HARK.ConsumptionSaving.ConsIndShockModel import (
-    ConsIndShockSolver,
-    IndShockConsumerType,
-    init_idiosyncratic_shocks,
-    init_lifecycle,
-)
-from HARK.ConsumptionSaving.ConsPortfolioModel import (
-    ConsPortfolioSolver,
-    PortfolioConsumerType,
-    PortfolioSolution,
-    init_portfolio,
-)
+    ConsIndShockSolver, IndShockConsumerType, init_idiosyncratic_shocks,
+    init_lifecycle)
+from HARK.ConsumptionSaving.ConsPortfolioModel import (ConsPortfolioSolver,
+                                                       PortfolioConsumerType,
+                                                       PortfolioSolution,
+                                                       init_portfolio)
 from HARK.core import make_one_period_oo_solver
-from HARK.interpolation import (
-    ConstantFunction,
-    IdentityFunction,
-    LinearInterp,
-    MargMargValueFuncCRRA,
-    MargValueFuncCRRA,
-    ValueFuncCRRA,
-)
+from HARK.interpolation import (ConstantFunction, IdentityFunction,
+                                LinearInterp, MargMargValueFuncCRRA,
+                                MargValueFuncCRRA, ValueFuncCRRA)
 from HARK.rewards import UtilityFuncCRRA, UtilityFuncStoneGeary
 
 
@@ -352,7 +343,7 @@ def calc_EndOfPrdvP(self):
 
 init_wealth_in_utility = init_idiosyncratic_shocks.copy()
 init_wealth_in_utility["BeqCRRA"] = init_idiosyncratic_shocks["CRRA"]
-init_wealth_in_utility["BeqFac"] = 1.0
+init_wealth_in_utility["BeqFac"] = 0.0
 init_wealth_in_utility["BeqShift"] = 0.0
 init_wealth_in_utility["TermBeqCRRA"] = init_idiosyncratic_shocks["CRRA"]
 init_wealth_in_utility["TermBeqFac"] = 0.0  # ignore bequest motive in terminal period
@@ -362,6 +353,8 @@ def calc_EndOfPrdvP(self):
 init_warm_glow["TermBeqCRRA"] = init_lifecycle["CRRA"]
 init_warm_glow["TermBeqFac"] = 1.0
 init_warm_glow["TermBeqShift"] = 0.0
+init_warm_glow["BeqFac"] = 0.0  # Value of bequest relative to consumption
+init_warm_glow["BeqShift"] = 0.0  # Shifts the utility function
 
 init_accidental_bequest = init_warm_glow.copy()
 init_accidental_bequest["BeqFac"] = 1.0  # Value of bequest relative to consumption

diff --git a/examples/ConsBequestModel/example_AccidentalBequest.ipynb b/examples/ConsBequestModel/example_AccidentalBequest.ipynb
diff --git a/examples/ConsBequestModel/example_AccidentalBequestPort.ipynb b/examples/ConsBequestModel/example_AccidentalBequestPort.ipynb
diff --git a/examples/ConsBequestModel/example_TerminalBequest.ipynb b/examples/ConsBequestModel/example_TerminalBequest.ipynb
diff --git a/examples/ConsBequestModel/example_TerminalBequestPort.ipynb b/examples/ConsBequestModel/example_TerminalBequestPort.ipynb