Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

simplify checks for time varying solveOnePeriod, fixes #496 #498

Merged
merged 3 commits into from
Mar 5, 2020
Merged

simplify checks for time varying solveOnePeriod, fixes #496 #498

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c96acc5
simplify checks for time varying solveOnePeriod, fixes #496
sbenthall Feb 9, 2020
0f062cd
Merge branch 'master' into i496b
sbenthall Feb 20, 2020
256a28f
Merge branch 'master' into i496b
sbenthall Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions HARK/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,13 @@ class Solution(HARKobject):

class AgentType(HARKobject):
'''
A superclass for economic agents in the HARK framework. Each model should
specify its own subclass of AgentType, inheriting its methods and overwriting
A superclass for economic agents in the HARK framework. Each model should
specify its own subclass of AgentType, inheriting its methods and overwriting
as necessary. Critically, every subclass of AgentType should define class-
specific static values of the attributes time_vary and time_inv as lists of
strings. Each element of time_vary is the name of a field in AgentSubType
that varies over time in the model. Each element of time_inv is the name of
a field in AgentSubType that is constant over time in the model. The string
'solveOnePeriod' should appear in exactly one of these lists, depending on
whether the same solution method is used in all periods of the model.
a field in AgentSubType that is constant over time in the model.
'''
def __init__(self, solution_terminal=None, cycles=1, time_flow=True, pseudo_terminal=True,
tolerance=0.000001, seed=0, **kwds):
Expand Down Expand Up @@ -871,12 +869,6 @@ def solveOneCycle(agent, solution_last):
else:
T = 1

# Check whether the same solution method is used in all periods
always_same_solver = 'solveOnePeriod' not in agent.time_vary
if always_same_solver:
solveOnePeriod = agent.solveOnePeriod
these_args = getArgNames(solveOnePeriod)

# Construct a dictionary to be passed to the solver
# time_inv_string = ''
# for name in agent.time_inv:
Expand All @@ -893,9 +885,12 @@ def solveOneCycle(agent, solution_last):
solution_next = solution_last
for t in range(T):
# Update which single period solver to use (if it depends on time)
if not always_same_solver:
if hasattr(agent.solveOnePeriod, "__getitem__"):
solveOnePeriod = agent.solveOnePeriod[t]
these_args = getArgNames(solveOnePeriod)
else:
solveOnePeriod = agent.solveOnePeriod

these_args = getArgNames(solveOnePeriod)

# Update time-varying single period inputs
for name in agent.time_vary:
Expand Down