diff --git a/requirements.txt b/requirements.txt index d66a966..daf5d7e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -git+https://github.com/econ-ark/HARK@master#egg=econ-ark +git+https://github.com/alanlujan91/HARK.git@approx_population azure-storage-blob jpype1 matplotlib diff --git a/simulate/parameters.py b/simulate/parameters.py index 6474339..a885dfd 100644 --- a/simulate/parameters.py +++ b/simulate/parameters.py @@ -58,11 +58,16 @@ def build_population(agent_type, parameters, seed=None, dphm=1500): whiteshark_continuous_distributed_params = { "CRRA": Uniform(bot=2, top=10), "DiscFac": Uniform(bot=0.984, top=0.994), - "RiskyAvg": Uniform(bot=0.9, top=1.5), - "RiskyStd": Uniform(bot=-0.07, top=0.37), + "RiskyAvg": Uniform(bot=1, top=1.5), + "RiskyStd": Uniform(bot=0, top=0.3), } -whiteshark_approx_params = {"CRRA": 3, "DiscFac": 2, "RiskyAvg": 10, "RiskyStd": 10} +whiteshark_approx_params = { + "CRRA": {"N": 3, "method": "equiprobable", "endpoints": True}, + "DiscFac": {"N": 2, "method": "equiprobable", "endpoints": True}, + "RiskyAvg": {"N": 5, "method": "equiprobable", "endpoints": True}, + "RiskyStd": {"N": 3, "method": "equiprobable", "endpoints": True}, +} ### Configuring the agent population @@ -86,7 +91,7 @@ def build_population(agent_type, parameters, seed=None, dphm=1500): lucas0_agent_population_params = { "cycles": 0, # issue 186 "aNrmInitStd": 0.0, - "aNrmInitMean": 6, # simulations show mNrm to be rather steady here + "aNrmInitMean": 6, # simulations show mNrm to be rather steady here "LivPrb": 0.98**0.25, "PermGroFac": 1.0, "pLvlInitMean": 0.0, ## This is the _log_ of the pLvl. So there is a quarterly income of 1.