Merge pull request #1152 from metrumresearchgroup/fix/ev-now-time

Never ignore .now doses based on .time

inst/maintenance/unit-cpp/test-cpp.R

@@ -157,3 +157,22 @@ test_that("mev lag times with F are respected", {
   a <- filter_sims(a, A==max(A))
   expect_identical(a$time, param(a)$t + param(a)$l + 0.5*mod$dose/param(a)$r)
 })
+
+code <- '
+$CMT A
+$MAIN
+if(TIME==1) {                // Give dose at TIME==1
+  mrgsolve::evdata ev(0, 1); // Set time to 0
+  ev.now = true;             // Also set now to true
+  ev.amt = 100;
+  self.mevector.push_back(ev);
+}
+'
+
+test_that("now doses are given even when time is past #1151", {
+  mod <- mcode("gh-1151", code)
+  out <- mrgsim(mod)
+  expect_false(all(out$A==0))
+  expect_equal(out$A[1], 0)
+  expect_equal(out$A[2], 100)
+})

src/devtran.cpp

@@ -624,7 +624,7 @@ Rcpp::List DEVTRAN(const Rcpp::List parin,
         for(size_t mti = 0; mti < mt.size(); ++mti) {
           // Unpack and check
           double this_time = (mt[mti]).time;
-          if(this_time < tto) continue;
+          if(this_time < tto && !mt[mti].now) continue;
           unsigned int this_evid = (mt[mti]).evid;
           if(this_evid==0) continue;
           double this_amt = mt[mti].amt;