Merge pull request #1118 from metrumresearchgroup/fix/hx-reset

Fix mevent hx reset
metrumresearchgroup · Nov 14, 2023 · c52292b · c52292b
2 parents d128f07 + 434f667
commit c52292b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/inst/maintenance/unit-cpp/test-cpp.R b/inst/maintenance/unit-cpp/test-cpp.R
@@ -24,3 +24,19 @@ test_that("build a model with mrgx and nm-vars", {
   )
 })
 
+code <- '
+$PK
+if(NEWIND <= 1) capture FLAG = 0;
+$CMT A
+$TABLE 
+if(TIME==2) self.mevent(2.001,33);
+if(EVID==33) ++FLAG;
+'
+test_that("ev history is reset", {
+  mod <- mcode("test-cpp-re-event", code, end = -1, add = c(1,2,3))
+  out <- mrgsim_df(mod, ev(amt = 0, ID = 1:2, evid = 2)) 
+  expect_equal(sum(out$FLAG), 2)  
+  out3 <- subset(out, time==3)
+  expect_length(out3$FLAG, 2)
+  expect_true(all(out3$FLAG==1))
+})
diff --git a/src/devtran.cpp b/src/devtran.cpp
@@ -388,6 +388,7 @@ Rcpp::List DEVTRAN(const Rcpp::List parin,
 
   prob.config_call();
   reclist mtimehx;
+  bool used_mtimehx = false;
 
   bool has_idata = idat.nrow() > 0;
   int this_idata_row = 0;
@@ -402,6 +403,7 @@ Rcpp::List DEVTRAN(const Rcpp::List parin,
     dat.next_id(i);
     prob.idn(i);
     prob.reset_newid(id);
+    if(used_mtimehx) mtimehx.clear();  
 
     if(i==0) {
       prob.newind(0);
@@ -616,7 +618,7 @@ Rcpp::List DEVTRAN(const Rcpp::List parin,
       }
 
       if(prob.any_mtime()) {
-        if(prob.newind() <=1) mtimehx.clear();  
+        // Will set used_mtimehx only if we push back
         std::vector<mrgsolve::evdata> mt  = prob.mtimes();
         for(size_t mti = 0; mti < mt.size(); ++mti) {
           double this_time = (mt[mti]).time;
@@ -643,6 +645,7 @@ Rcpp::List DEVTRAN(const Rcpp::List parin,
             } 
           }
         }
+        used_mtimehx = mtimehx.size() > 0;
         prob.clear_mtime();
       }
       if(this_rec->output()) {