Merge branch 'main' into 68-use-new-steady-state-for-lincmt

inst/include/rxode2parseStruct.h

@@ -1,3 +1,4 @@
+
 #ifndef __RXODE2PARSESTRUCT_H__
 #define __RXODE2PARSESTRUCT_H__
 

src/etTran.cpp

@@ -52,10 +52,10 @@ static inline CharacterVector asCv(SEXP in, const char *what) {
 #ifdef asError
     REprintf(_("'%s' needs to be a vector of strings"), what);
     abort();
-#else 
+#else
     Rcpp::stop(_("'%s' needs to be a vector of strings"), what);
 #endif
-  } 
+  }
   return as<CharacterVector>(in);
 }
 
@@ -489,7 +489,7 @@ bool rxode2parseIsIntegerish(SEXP in) {
 //' @param ssAtDoseTime Boolean that when `TRUE` back calculates the
 //'   steady concentration at the actual time of dose, otherwise when
 //'   `FALSE` the doses are shifted
-//' 
+//'
 //' @return Object for solving in rxode2
 //'
 //' @keywords internal
@@ -799,6 +799,8 @@ List etTransParse(List inData, List mv, bool addCmt=false,
   idxOutput.reserve(resSize);
   std::vector<int> cens;
   cens.reserve(resSize);
+  std::vector<int> nObsId;
+
 
 #ifdef rxSolveT
   REprintf("  Time3: %f\n", ((double)(clock() - _lastT0))/CLOCKS_PER_SEC);
@@ -977,7 +979,8 @@ List etTransParse(List inData, List mv, bool addCmt=false,
   double camt;
   int curIdx=0;
   double cdv, climit;
-  int nobs=0, ndose=0;
+  int nobs=0, nobsCur=0, ndose=0;
+
   int ccens=0;
   bool warnCensNA=false;
   bool censNone=true;