Add tests for ConsBequestModel and fix typos

Fixed two small errors in WarmGlowPortfolio model and added basic tests.

HARK/ConsumptionSaving/ConsBequestModel.py

@@ -340,13 +340,13 @@ def __init__(
 
     def def_utility_funcs(self):
         super().def_utility_funcs()
-
-        self.warm_glow = UtilityFuncStoneGeary(self.BeqCRRA, self.BeqFac, self.BeqShift)
+        BeqFacEff = (1.0 - self.LivPrb) * self.BeqFac
+        self.warm_glow = UtilityFuncStoneGeary(self.BeqCRRA, BeqFacEff, self.BeqShift)
 
     def calc_EndOfPrdvP(self):
         super().calc_EndOfPrdvP()
 
-        self.EndofPrddvda = self.EndOfPrddvda + self.warm_glow.der(self.aNrm_tiled)
+        self.EndOfPrddvda = self.EndOfPrddvda + self.warm_glow.der(self.aNrm_tiled)
         self.EndOfPrddvdaNvrs = self.uPinv(self.EndOfPrddvda)
 
 

HARK/ConsumptionSaving/tests/test_ConsBequestModel.py

@@ -0,0 +1,61 @@
+import unittest
+from HARK.tests import HARK_PRECISION
+from HARK.ConsumptionSaving.ConsBequestModel import (
+    BequestWarmGlowConsumerType,
+    BequestWarmGlowPortfolioType,
+)
+
+
+class testWarmGlowConsumerType(unittest.TestCase):
+    def setUp(self):
+        self.agent = BequestWarmGlowConsumerType()
+        self.agent.vFuncBool = True
+        self.agent.solve()
+
+    def test_solution(self):
+        cFunc = self.agent.solution[0].cFunc
+        mNrm = 10.0
+        self.assertAlmostEqual(cFunc(mNrm).tolist(), 5.56409, places=HARK_PRECISION)
+
+    # TODO: Turn this on when solver overhaul branch is merged (needs correct value)
+    # def test_value(self):
+    #     vFunc = self.agent.solution[0].vFunc
+    #     mNrm = 10.0
+    #     self.assertAlmostEqual(vFunc(mNrm), -0.0000, places=HARK_PRECISION)
+
+    def test_simulation(self):
+        self.agent.T_sim = 10
+        self.agent.track_vars = ["mNrm", "cNrm", "aNrm"]
+        self.agent.make_shock_history()
+        self.agent.initialize_sim()
+        self.agent.simulate()
+
+
+class testBequestWarmGlowPortfolioType(unittest.TestCase):
+    def setUp(self):
+        self.agent = BequestWarmGlowPortfolioType()
+        self.agent.vFuncBool = True
+        self.agent.solve()
+
+    def test_consumption(self):
+        cFunc = self.agent.solution[0].cFuncAdj
+        mNrm = 10.0
+        self.assertAlmostEqual(cFunc(mNrm).tolist(), 2.19432, places=HARK_PRECISION)
+
+    def test_share(self):
+        ShareFunc = self.agent.solution[0].ShareFuncAdj
+        mNrm = 10.0
+        self.assertAlmostEqual(ShareFunc(mNrm).tolist(), 0.75504, places=HARK_PRECISION)
+
+    # TODO: Turn this on when solver overhaul branch is merged (needs correct value)
+    # def test_value(self):
+    #     vFunc = self.agent.solution[0].vFuncAdj
+    #     mNrm = 10.0
+    #     self.assertAlmostEqual(vFunc(mNrm), -0.0000, places=HARK_PRECISION)
+
+    def test_simulation(self):
+        self.agent.T_sim = 10
+        self.agent.track_vars = ["mNrm", "cNrm", "aNrm", "Share"]
+        self.agent.make_shock_history()
+        self.agent.initialize_sim()
+        self.agent.simulate()