Fixing recurrence of HSIs in RTI #1408
Merged
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
tbhallett
requested changes
Jul 1, 2024
src/tlo/methods/rti.py
Outdated
Comment on lines
4481
to
4482
| if pd.isnull(df.loc[person_id, 'rt_date_death_no_med']): | ||
| df.loc[person_id, 'rt_date_death_no_med'] = self.sim.date + DateOffset(days=7) |
There was a problem hiding this comment.
same comment as above about moving this outside the new clause.
tbhallett
reviewed
Jul 3, 2024
There was a problem hiding this comment.
Thanks again @thewati
I just made those few other changes about the positioning of some of those places where there is writing the sim.populations.props dataframe. I think these changes ensure that we preserve the logic that was originally intended. Let me know if it looks right to you....?
src/tlo/methods/rti.py
Outdated
Comment on lines
4247
to
4250
| if self._number_of_times_this_event_has_run < self._maximum_number_times_event_should_run: | ||
| self.sim.modules['RTI'].schedule_hsi_event_for_tomorrow(self) | ||
| if pd.isnull(df.loc[person_id, 'rt_date_death_no_med']): | ||
| df.loc[person_id, 'rt_date_death_no_med'] = self.sim.date + DateOffset(days=7) |
There was a problem hiding this comment.
Suggested change
| if self._number_of_times_this_event_has_run < self._maximum_number_times_event_should_run: | |
| self.sim.modules['RTI'].schedule_hsi_event_for_tomorrow(self) | |
| if pd.isnull(df.loc[person_id, 'rt_date_death_no_med']): | |
| df.loc[person_id, 'rt_date_death_no_med'] = self.sim.date + DateOffset(days=7) | |
| if self._number_of_times_this_event_has_run < self._maximum_number_times_event_should_run: | |
| self.sim.modules['RTI'].schedule_hsi_event_for_tomorrow(self) | |
| if pd.isnull(df.loc[person_id, 'rt_date_death_no_med']): | |
| df.loc[person_id, 'rt_date_death_no_med'] = self.sim.date + DateOffset(days=7) |
tbhallett
approved these changes
Jul 8, 2024
|
Thanks again @thewati -- this looks good to me now. |
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.
Fixing recurring HSI_Events of RTI module. Reworked logic #1403