Merge branch 'bug/spraying' of https://github.com/mrc-ide/malariasimu…

…lation into bug/spraying
mrc-ide · May 28, 2024 · 732bc0c · 732bc0c
2 parents 9922527 + 7c5232c
commit 732bc0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/R/mortality_processes.R b/R/mortality_processes.R
@@ -111,6 +111,9 @@ reset_target <- function(variables, events, target, state, parameters, timestep)
     variables$pev_profile$queue_update(-1, target)
     variables$tbv_vaccinated$queue_update(-1, target)
 
+    # spraying
+    variables$spray_time$queue_update(-1, target)
+
     # onwards infectiousness
     variables$infectivity$queue_update(0, target)
 

diff --git a/tests/testthat/test-vector-control.R b/tests/testthat/test-vector-control.R
@@ -218,6 +218,7 @@ test_that('indoor_spraying process sets spray_time correctly', {
   mockery::expect_args(target_mock, 1, seq(4), 'spraying', .9, correlations)
   mockery::expect_args(
     spray_time$queue_update_mock(),
+    renderer$render,
     1,
     50,
     c(3, 4)