Fix after merge

mrc-ide · May 15, 2024 · b9a48fb · b9a48fb
1 parent 8aa6c38
commit b9a48fb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/R/cpp11.R b/R/cpp11.R
@@ -20,8 +20,8 @@ dust2_cpu_sir_set_state_initial <- function(ptr) {
   .Call(`_dust2_dust2_cpu_sir_set_state_initial`, ptr)
 }
 
-dust2_cpu_sir_set_state <- function(ptr, r_state) {
-  .Call(`_dust2_dust2_cpu_sir_set_state`, ptr, r_state)
+dust2_cpu_sir_set_state <- function(ptr, r_state, grouped) {
+  .Call(`_dust2_dust2_cpu_sir_set_state`, ptr, r_state, grouped)
 }
 
 dust2_cpu_sir_rng_state <- function(ptr) {

diff --git a/src/cpp11.cpp b/src/cpp11.cpp
@@ -41,10 +41,10 @@ extern "C" SEXP _dust2_dust2_cpu_sir_set_state_initial(SEXP ptr) {
   END_CPP11
 }
 // sir.cpp
-SEXP dust2_cpu_sir_set_state(cpp11::sexp ptr, cpp11::sexp r_state);
-extern "C" SEXP _dust2_dust2_cpu_sir_set_state(SEXP ptr, SEXP r_state) {
+SEXP dust2_cpu_sir_set_state(cpp11::sexp ptr, cpp11::sexp r_state, bool grouped);
+extern "C" SEXP _dust2_dust2_cpu_sir_set_state(SEXP ptr, SEXP r_state, SEXP grouped) {
   BEGIN_CPP11
-    return cpp11::as_sexp(dust2_cpu_sir_set_state(cpp11::as_cpp<cpp11::decay_t<cpp11::sexp>>(ptr), cpp11::as_cpp<cpp11::decay_t<cpp11::sexp>>(r_state)));
+    return cpp11::as_sexp(dust2_cpu_sir_set_state(cpp11::as_cpp<cpp11::decay_t<cpp11::sexp>>(ptr), cpp11::as_cpp<cpp11::decay_t<cpp11::sexp>>(r_state), cpp11::as_cpp<cpp11::decay_t<bool>>(grouped)));
   END_CPP11
 }
 // sir.cpp
@@ -131,7 +131,7 @@ static const R_CallMethodDef CallEntries[] = {
     {"_dust2_dust2_cpu_sir_compare_data",       (DL_FUNC) &_dust2_dust2_cpu_sir_compare_data,       3},
     {"_dust2_dust2_cpu_sir_rng_state",          (DL_FUNC) &_dust2_dust2_cpu_sir_rng_state,          1},
     {"_dust2_dust2_cpu_sir_run_steps",          (DL_FUNC) &_dust2_dust2_cpu_sir_run_steps,          2},
-    {"_dust2_dust2_cpu_sir_set_state",          (DL_FUNC) &_dust2_dust2_cpu_sir_set_state,          2},
+    {"_dust2_dust2_cpu_sir_set_state",          (DL_FUNC) &_dust2_dust2_cpu_sir_set_state,          3},
     {"_dust2_dust2_cpu_sir_set_state_initial",  (DL_FUNC) &_dust2_dust2_cpu_sir_set_state_initial,  1},
     {"_dust2_dust2_cpu_sir_state",              (DL_FUNC) &_dust2_dust2_cpu_sir_state,              2},
     {"_dust2_dust2_cpu_sir_time",               (DL_FUNC) &_dust2_dust2_cpu_sir_time,               1},

diff --git a/src/sir.cpp b/src/sir.cpp
@@ -41,8 +41,8 @@ SEXP dust2_cpu_sir_set_state_initial(cpp11::sexp ptr) {
 }
 
 [[cpp11::register]]
-SEXP dust2_cpu_sir_set_state(cpp11::sexp ptr, cpp11::sexp r_state) {
-  return dust2::r::dust2_cpu_set_state<sir>(ptr, r_state);
+SEXP dust2_cpu_sir_set_state(cpp11::sexp ptr, cpp11::sexp r_state, bool grouped) {
+  return dust2::r::dust2_cpu_set_state<sir>(ptr, r_state, grouped);
 }
 
 [[cpp11::register]]

diff --git a/tests/testthat/test-sir.R b/tests/testthat/test-sir.R
@@ -30,7 +30,7 @@ test_that("can compare to data", {
   ptr <- obj[[1]]
 
   s <- rbind(0, 0, 0, 0, rpois(10, 30))
-  dust2_cpu_sir_set_state(ptr, s)
+  dust2_cpu_sir_set_state(ptr, s, FALSE)
   d <- list(incidence = 30)
 
   r <- mcstate2::mcstate_rng$new(seed = 42, n_streams = 10)
@@ -48,7 +48,7 @@ test_that("can compare to data when missing", {
   ptr <- obj[[1]]
 
   s <- rbind(0, 0, 0, 0, rpois(10, 30))
-  dust2_cpu_sir_set_state(ptr, s)
+  dust2_cpu_sir_set_state(ptr, s, FALSE)
   d <- list(incidence = NA_real_)
 
   r <- mcstate2::mcstate_rng$new(seed = 42, n_streams = 10)
@@ -68,7 +68,7 @@ test_that("can compare against multple parameter groups at once", {
 
   s <- dust2_cpu_sir_state(ptr, TRUE)
   s[5, , ] <- rpois(10, 30)
-  dust2_cpu_sir_set_state(ptr, s)
+  dust2_cpu_sir_set_state(ptr, s, TRUE)
 
   d <- lapply(1:4, function(i) list(incidence = 30 + i))
   res <- dust2_cpu_sir_compare_data(ptr, d, TRUE)