Include linCmtRate too

nlmixr2 · Oct 6, 2023 · f2e91f9 · f2e91f9
1 parent 34109c1
commit f2e91f9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/inst/include/rxode2parseGetTime.h b/inst/include/rxode2parseGetTime.h
@@ -50,6 +50,9 @@ extern "C" {
   static inline double getRate(rx_solving_options_ind *ind, int id, int cmt, double dose, double t){
     rx_solving_options *op = &op_global;
     returnBadTime(t);
+    if (cmt >= op->neq) {
+      return ind->linCmtRate[cmt - op->neq];
+    }
     double ret = RATE(id, cmt, dose, t);
     if (ISNA(ret)){
       op->badSolve=1;

diff --git a/inst/include/rxode2parseStruct.h b/inst/include/rxode2parseStruct.h
@@ -293,6 +293,7 @@ extern "C" {
     double *linCmtLag;
     double *linCmtF;
     double *linCmtDur;
+    double *linCmtRate;
   } rx_solving_options_ind;
 
   typedef struct {

diff --git a/src/comp.c b/src/comp.c
@@ -285,10 +285,13 @@ double linCmtCompA(rx_solve *rx, unsigned int id, double _t, int linCmt,
     ind->linCmtF[1] = d_F2;
     ind->linCmtDur[0] = d_dur1;
     ind->linCmtDur[1] = d_dur2;
+    ind->linCmtRate[0] = d_rate1;
+    ind->linCmtRate[1] = d_rate2;
   } else {
     ind->linCmtLag[0] = d_tlag;
     ind->linCmtF[0]   = d_F;
     ind->linCmtDur[0] = d_dur1;
+    ind->linCmtRate[0] = d_rate1;
   }
   void *ctx = &(lin);
   if (ind->idx == 0) {
@@ -417,11 +420,15 @@ SEXP _rxode2parse_compC(SEXP in, SEXP mv) {
   linCmtF[0] = linCmtF[1] = 1.0;
   indR.linCmtF = linCmtF;
   double linCmtDur[2];
+  linCmtDur[0] = linCmtDur[1] = 0.0;
+  indR.linCmtDur = linCmtDur;
+
+  double linCmtRate[2];
+  linCmtRate[0] = linCmtRate[1] = 0.0;
+  indR.linCmtRate = linCmtRate;
   int rc[1];
   rc[0] = 0;
   indR.rc=rc;
-  linCmtDur[0] = linCmtDur[1] = 0.0;
-  indR.linCmtDur = linCmtDur;
   indR.nBadDose = 0;
   indR.HMAX = 0.0; // Determined by diff
   indR.curDose = NA_REAL;