read_shocks now reads mortality as well #613
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For a long time we've had the ability to store a history of shocks in an AgentType instance and then read them on a simulation pass (rather than draw them anew each time). This used the makeShockHistory() method of AgentType. However, this didn't fully do what it was supposed to, as mortality shocks need to be recorded as well.
This commit makes the history of who_dies be recorded when makeShockHistory is run, and for who_dies to be read from that history when read_shocks is True. It also breaks up one method of MrkvConsumerType into two; just a copy-paste of code with a new docstring.