Merge pull request #1014 from metrumresearchgroup/release/1.0.6

Release/1.0.6

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: mrgsolve
 Title: Simulate from ODE-Based Models
-Version: 1.0.5
+Version: 1.0.6
 Authors@R: 
     c(person(given = "Kyle T", family = "Baron",
              role = c("aut", "cre"),

NEWS.md

@@ -1,3 +1,11 @@
+# mrgsolve 1.0.6
+
+## Bugs Fixed
+
+- Fix bug in `TOUCH_FUNS` where parameter and compartment lists were not 
+  getting generated properly when `mrgsolve` was not loaded; bug was
+  detected and fixed prior to upload to CRAN or MPN (#1013).
+
 # mrgsolve 1.0.5
 
 - Changed behavior for dosing records where EVID = 4 and SS != 0 

src/devtran.cpp

@@ -87,12 +87,14 @@ Rcpp::List DEVTRAN(const Rcpp::List parin,
   request = request - 1;
 
   // Parameters; clone names
-  const Rcpp::List Param = mod.slot("param");
+  const Rcpp::S4 ParamS4 = mod.slot("param");
+  const Rcpp::List Param = ParamS4.slot("data");
   Rcpp::CharacterVector paramnames(Param.names());
   paramnames = Rcpp::clone(paramnames);
 
   // Compartments; clone names
-  const Rcpp::List Init = mod.slot("init");
+  const Rcpp::S4 InitS4 = mod.slot("init");
+  const Rcpp::List Init = InitS4.slot("data");
   Rcpp::CharacterVector cmtnames(Init.names());
   cmtnames = Rcpp::clone(cmtnames);
   Rcpp::NumericVector init(Init.size());

src/odeproblem.cpp

@@ -716,8 +716,10 @@ Rcpp::List TOUCH_FUNS(const Rcpp::List& funs,
   Rcpp::List ans;
 
   Rcpp::Environment envir = mod.slot("envir");
-  Rcpp::List lparam = mod.slot("param");
-  Rcpp::List linit = mod.slot("init");
+  Rcpp::S4 paramS4 = mod.slot("param");
+  Rcpp::List lparam = paramS4.slot("data");
+  Rcpp::S4 initS4 = mod.slot("init");
+  Rcpp::List linit = initS4.slot("data");
   Rcpp::CharacterVector capture = mod.slot("capture");
 
   lparam = Rcpp::clone(lparam);