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.

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

Removing time flipping and time flow state #570

Merged
merged 28 commits into from
Apr 23, 2020
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
a7b271d
removing timeFlip() etc. methods and tests. breaks solvers before rev…
sbenthall Mar 15, 2020
96c9485
removing time fixing from ConsumptionSaving models; always assume for…
sbenthall Mar 15, 2020
486cd51
remove time_flow as a model initializer parameter
sbenthall Mar 15, 2020
7ce6239
whoops; putting back in an unpackFunc
sbenthall Mar 15, 2020
f98f2f0
moving solution reversal inside solveAgent()
sbenthall Mar 15, 2020
8a7bcb2
just some line breaks/cleanup
sbenthall Mar 16, 2020
a0320af
stack solutions in solveAgent and solveOneCycle in forward order
sbenthall Mar 16, 2020
c7d3836
comment fixes
sbenthall Mar 16, 2020
877fa64
add test of the solution terminal in the LifecycleExample
sbenthall Mar 16, 2020
b6be240
adding tests for LifecycleExample solution consumption function
sbenthall Mar 16, 2020
7c2f6c5
More tests for the IndShockConsumerType LifecycleExample
sbenthall Mar 16, 2020
6af22a0
in solveOneCycle, assume data is forward, not backward
sbenthall Mar 16, 2020
4dfc6c9
reverting bad change to test suite
sbenthall Mar 16, 2020
d545b55
remove references to time flow from comments
sbenthall Mar 16, 2020
e4e18d5
don't bother adding solution to time_vary, fixes #573
sbenthall Mar 17, 2020
601963b
Merge branch 'master' into i569-timing
sbenthall Mar 17, 2020
5a9f77e
adding back in init_lifecycle and init_cyclical, lost in merge
sbenthall Mar 17, 2020
2b66c1b
remove time_flow from examples/
sbenthall Mar 18, 2020
060e7e9
Merge branch 'master' into i569-timing
sbenthall Mar 25, 2020
3cdfe79
fixing syntax error from merge
sbenthall Mar 25, 2020
235ef7e
Merge branch 'master' into i569-timing
sbenthall Mar 26, 2020
04ce438
Merge branch 'master' into i569-timing
llorracc Apr 2, 2020
340eeca
Merge branch 'master' into i569-timing
sbenthall Apr 3, 2020
51110c8
Merge branch 'master' into i569-timing
sbenthall Apr 4, 2020
a5f9805
Merge branch 'master' into i569-timing
sbenthall Apr 8, 2020
bd9f652
repair ConsRepAgentModel
sbenthall Apr 8, 2020
ab24b50
Merge branch 'master' into i569-timing
sbenthall Apr 9, 2020
4f325e2
Merge branch 'master' into i569-timing
mnwhite Apr 23, 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
Prev Previous commit
Next Next commit
remove references to time flow from comments
sbenthall committed Mar 16, 2020
commit d545b556caa3b512ee4543a1e068f29cca4ac04a
4 changes: 2 additions & 2 deletions HARK/core.py
Original file line number Diff line number Diff line change
@@ -459,7 +459,7 @@ def makeShockHistory(self):
-------
None
'''
# Make sure time is flowing forward and re-initialize the simulation
# Re-initialize the simulation
self.initializeSim()

# Make blank history arrays for each shock variable
@@ -477,7 +477,7 @@ def makeShockHistory(self):
self.t_cycle = self.t_cycle + 1 # Age all consumers within their cycle
self.t_cycle[self.t_cycle == self.T_cycle] = 0 # Resetting to zero for those who have reached the end

# Restore the flow of time and flag that shocks can be read rather than simulated
# Flag that shocks can be read rather than simulated
self.read_shocks = True

def getMortality(self):