Merge pull request #259 from nlmixr2/255-bad-split-ui-impacts-multipl…

…e-things-including-babelmixr2

Fix and test for non mu-referenced model

R/splitModelRxUiGet.R

@@ -86,6 +86,11 @@
   }
 }
 
+.isCurEvalEncodedFunction <- function(curEval) {
+  if (any(curEval == c("*", "/", "^", "**", "+", "-", ""))) return(FALSE)
+  TRUE
+}
+
 #' This creates a mu-referenced expression block like NONMEM's PK block
 #'
 #' @param var Variable defined in model
@@ -110,11 +115,13 @@
   } else {
     stop("duplicate/missing parameter in `muRefCurEval`", call.=FALSE)
   }
-  str2lang(paste0(var, "<-", .curEval, ifelse(.curEval == "", "", "("),
+  .encFun <- .isCurEvalEncodedFunction(.curEval)
+  str2lang(paste0(var, "<-", ifelse(.encFun, .curEval, ""),
+                  ifelse(.encFun, "(", ""),
                   est,
                   ifelse(is.na(.low), "", paste0(",", .low)),
                   ifelse(is.na(.hi), "", paste0(",", .hi)),
-                  ifelse(.curEval == "", "", ")")))
+                  ifelse(.encFun, ")", "")))
 }
 
 #' @export

tests/testthat/test-split.R

@@ -104,3 +104,26 @@ test_that("test split", {
   mod <- PK_1cmt()
   expect_error(mod$getSplitMuModel, NA)
 })
+
+
+test_that("non mu-referenced split works correctly", {
+  f <- function() {
+    ini({
+      tke <- 0.5
+      eta.ke ~ 0.04
+      prop.sd <- sqrt(0.1)
+    })
+    model({
+      ke <- tke * exp(eta.ke)
+      ipre <- 10 * exp(-ke * t)
+      f2 <- ipre / (ipre + 5)
+      f3 <- f2 * 3
+      lipre <- log(ipre)
+      ipre ~ prop(prop.sd)
+    })
+  }
+
+  ui <- f()
+
+  expect_error(ui$getSplitMuModel, NA)
+})