Merge remote-tracking branch 'origin/main' into 130-crash-multiple-mo…

…dels
nlmixr2 · Oct 18, 2024 · bf5b1fa · bf5b1fa
2 parents 62aa16f + cd8554d
commit bf5b1fa
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/R/poped.R b/R/poped.R
@@ -338,15 +338,15 @@ rxUiGet.popedFfFun <- function(x, ...) {
     # be in the right order
     if (.lu <=  .(.poped$maxn)) {
       # only check for time reset if it is specified in the model
-      .popedRxRunSetup(poped.db)
+      poped.db <- .popedRxRunSetup(poped.db)
       .p <- babelmixr2::popedMultipleEndpointParam(p, .u, model_switch,
                                                    .(.poped$maxn),
                                                    poped.db$babelmixr2$optTime)
       .ret <- .popedSolveIdME(.p, .u, .xt, model_switch, .(length(.predDf$cond)),
                               .id-1, .totn)
     } else if (.lu > .(.poped$maxn)) {
       .p <- p[-1]
-      .popedRxRunFullSetupMe(poped.db, .xt, model_switch)
+      poped.db <- .popedRxRunFullSetupMe(poped.db, .xt, model_switch)
       .ret <- .popedSolveIdME2(.p, .u, .xt, model_switch, .(length(.predDf$cond)),
                                .id-1, .totn)
     }
@@ -425,7 +425,7 @@ attr(rxUiGet.popedFfFun, "desc") <- "PopED parameter model (ff_fun)"
     .poped$setup <- 1L
     .poped$fullXt <- NULL
   }
-  invisible()
+  invisible(popedDb)
 }
 #' Setup a full solve for a multiple-endpoint model
 #'
@@ -495,6 +495,7 @@ attr(rxUiGet.popedFfFun, "desc") <- "PopED parameter model (ff_fun)"
     .poped$curNumber <- popedDb$babelmixr2$modelNumber
     .poped$setup <- 2L
   }
+  popedDb
 }
 #' Setup for a full solve with a single endpoint model
 #'
@@ -561,6 +562,7 @@ attr(rxUiGet.popedFfFun, "desc") <- "PopED parameter model (ff_fun)"
     .poped$curNumber <- popedDb$babelmixr2$modelNumber
     .poped$setup <- 2L
   }
+  popedDb
 }
 
 #' This gets the epsi associated with the nlmixr2/rxode2 model specification