Merge pull request #489 from metrumresearchgroup/release/0.9.2

Release/0.9.2

Author: kylebaron

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: mrgsolve
 Type: Package
-Version: 0.9.1
+Version: 0.9.2
 Title: Simulate from ODE-Based Models
 Authors@R: c(
     person("Kyle T", "Baron", email = "[email protected]", role=c("aut", "cre"), comment=c(ORCID="0000-0001-7252-5656")),

NEWS.md

@@ -1,3 +1,10 @@
+
+# mrgsolve 0.9.1.9000
+- Fix bug where system advanced to next time after advancing to steady state
+  on a dosing record with ss=1 with no observation record at the same time
+  but preceeding the dosing record #484
+- Add AMT and CMT macros for self.amt and self.cmt, respectively #354
+
 # mrgsolve 0.9.1
 
 - Fix bug in TAD plugin where time of last dose never moved from default

inst/base/modelheader.h

@@ -77,6 +77,10 @@ typedef bool   local_bool;
 #define EVID self.evid
 // Data set individual
 #define ID self.id
+// Data set amt
+#define AMT self.amt
+// Data set cmt
+# define CMT self.cmt
 
 
 // These are the fundamental macros for

inst/maintenance/unit/test-alag.R

@@ -84,3 +84,14 @@ test_that("Error lagtime+duration >= ii for infusion", {
   expect_error(mrgsim(mod, ev = e))
 })
 
+# Issue 484
+test_that("ss dose with lag time, different arrangements", {
+  data1 <- 
+    ev(amt = 100,time=240,ss=1,ii=12) %>% 
+    expand_observations(c(0,seq(240,264,4)))
+  data2 <- dplyr::arrange(data1, time, 1-evid)
+  out1 <- mrgsim_d(mod,data1) %>% slice(-c(1,2))
+  out2 <- mrgsim_d(mod,data2) %>% slice(-c(1,2))
+  expect_identical(out1,out2)
+})
+

src/devtran.cpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2013 - 2019  Metrum Research Group, LLC
+// Copyright (C) 2013 - 2019  Metrum Research Group
 //
 // This file is part of mrgsolve.
 //
@@ -474,8 +474,7 @@ Rcpp::List DEVTRAN(const Rcpp::List parin,
         prob->set_d(this_rec);
         prob->init_call_record(tto);
       }
-      
-      
+
       // Some non-observation event happening
       if(this_rec->is_event()) {
 
@@ -496,8 +495,10 @@ Rcpp::List DEVTRAN(const Rcpp::List parin,
           }
 
           if(prob->alag(this_cmtn) > mindt) { // there is a valid lagtime
+            
             if(this_rec->ss() > 0) {
               this_rec->steady(prob, Fn);
+              tfrom = tto;
             }
             rec_ptr newev = NEWREC(*this_rec);
             newev->pos(__ALAG_POS);