Fix cohort update time condition

[acavelan]

Human cohort membership is tested and updated in 3 places:

Human::isInSubPop() mostly used during the deployment of interventions, just before the beginning of the time-step

Human::updateCohortSet() used during the Clinical model update, at the beginning of Human::update()

Human::removeFirstEvent() used during the Clinical model update and and just after a survey.

However, updateCohortSet() used the following condition:

if( duration >= sim::nowOrTs0() )

while isInSubPop() and removeFirstEvent() used:

if( duration > sim::nowOrTs0() )

Given that all of these tests are done in the same time-frame (after a survey, before the end of the time-step), they must use the same condition.

Old time-line example:

• Cohort created at time t with duration 2
  • Time-step update
  • Cohort update: t + 2 >= t: nothing to do
• Cohort deployment with isInSubPop: t + 2 > t + 1: nothing to do
  • Time-step update
  • Cohort update: t + 2 >= t + 1: nothing to do
• Cohort deployment with isInSubPop: t + 2 > t + 2: nothing to do
  • Time-step update
  • Cohort update: t + 2 >= t + 2: human removed from cohort

New time-line example:

• Cohort created at time t with duration 2
  • Time-step update
  • Cohort update: t + 2 >= t: nothing to do
• Cohort deployment with isInSubPop: t + 2 >= t + 1: nothing to do
  • Time-step update
  • Cohort update: t + 2 >= t + 1: nothing to do
• Cohort deployment with isInSubPop: t + 2 >= t + 2: human no longer in the cohort
  • Time-step update
  • Cohort update: t + 2 >= t + 2: human removed from cohort

Note that the change has no effect on the tests. This only affect intervention deployment conditional on cohort membership, when duration is finite, wihich is a specific case that is not part of the test suite yet.

[melissapenny]

Thank you for the fix, well spotted