PopED fix

nlmixr2 · Oct 15, 2024 · fe17723 · fe17723
1 parent 036d3c6
commit fe17723
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,9 @@
 
 * Fix bug where `PopED` could error with certain `dvid` values
 
+* Fix bug where if/else clauses in the model could cause the model to
+  not predict the values correctly.
+
 # babelmixr2 0.1.4
 
 * Added experimental `PopED` integration

diff --git a/R/poped.R b/R/poped.R
@@ -825,7 +825,10 @@ rxUiGet.popedRxmodelBase <- function(x, ...) {
                      logical(1), USE.NAMES = FALSE))
   .mod <- .mod[.w]
   .errDf <- .iniDf[!is.na(.iniDf$err), ,drop=FALSE]
-
+  # remove if/else so extra lhs statements are not hanging around
+  .mod <- str2lang(paste0("{", rxode2::.rxPrune(as.call(c(quote(`{`), .mod))), "}"))
+  .mod <- lapply(seq_along(.mod)[-1],
+                 function(i) { .mod[[i]]})
   .mod <- lapply(seq_along(.mod),
                  function(i) {
                    .cur <- .mod[[i]]

diff --git a/tests/testthat/test-poped.R b/tests/testthat/test-poped.R
@@ -622,5 +622,6 @@ if (requireNamespace("PopED", quietly=TRUE)) {
     p <- pheno()
 
     expect_equal(eval(.popedRxModel(p))$lhs, c("rx_pred_", "rx_r_"))
+
   })
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -622,5 +622,6 @@ if (requireNamespace("PopED", quietly=TRUE)) { @@
         p <- pheno()
         expect_equal(eval(.popedRxModel(p))$lhs, c("rx_pred_", "rx_r_"))
       })
     }