Fixing bugs encountered while working on scenario modeling #389
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Reworked sir_vaccine to modify rel_sus instead of moving agents from susceptible to recovered. * n_years no longer necessarily an integer * yearvec had an extra year * Convert network keys to lowercase * In Interventions, CampaignDelivery now is just discrete timepoints. Interpolation and annual_prob options removed. Fixed timepoints as `ss.true` functionality differs in Starsim than previous models, now using sc.findnearest. * Also in Interventions, adding `coverage_dist` to BasicVaccination, which was missing.
cliffckerr
reviewed
Mar 15, 2024
Comment on lines
+75
to
+76
| self.ti_dead[dead_uids] = sim.ti + dur_inf[will_die] / sim.dt # Consider rand round, but not CRN safe | ||
| self.ti_recovered[rec_uids] = sim.ti + dur_inf[~will_die] / sim.dt |
starsim/sim.py
Outdated
| @@ -188,7 +188,7 @@ def init_time_vecs(self): | |||
| """ | |||
| Construct vectors things that keep track of time | |||
| """ | |||
| self.yearvec = sc.inclusiverange(start=self.pars.start, stop=self.pars.end + 1 - self.pars.dt, | |||
| self.yearvec = sc.inclusiverange(start=self.pars.start, stop=self.pars.end - self.pars.dt, | |||
There was a problem hiding this comment.
Much as I love Sciris, this has evolved into a very convoluted way to replicate the behavior of np.arange(self.pars.start, self.pars.end, self.pars.dt)!
There was a problem hiding this comment.
I think the previous version was correct, based on the comment "# Includes all the timepoints in the last year".
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
ss.truefunctionality differs in Starsim than previous models, now using sc.findnearest.coverage_distto BasicVaccination, which was missing.