Merge branch 'master' into i838

econ-ark · Oct 23, 2020 · 94fe400 · 94fe400
2 parents 9d313ef + a05e2ea
commit 94fe400
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/HARK/ConsumptionSaving/ConsAggShockModel.py b/HARK/ConsumptionSaving/ConsAggShockModel.py
@@ -676,7 +676,6 @@ def __init__(self, **kwds):
             "DiscFac",
             "CRRA",
         ]
-
         # need better handling of this
         self.state_now = {
             "aNow" : None,
@@ -689,6 +688,8 @@ def __init__(self, **kwds):
             "EmpNow" : None
         }
 
+        self.shock_vars = {}
+
         self.solveOnePeriod = solveKrusellSmith
         self.update()
 

diff --git a/HARK/ConsumptionSaving/tests/test_ConsAggShockModel.py b/HARK/ConsumptionSaving/tests/test_ConsAggShockModel.py
@@ -155,7 +155,6 @@ def test_methods(self):
             0.4818181818181818
         )
 
-
         # object attributes that are conditions
         # for preComputeArrays
         self.assertEqual(