}}\preformatted{## rxode2 2.0.14.9000 model named rx_9140ece6c151a5d4341598adc0f7f3b6 model (ready).
+\if{html}{\out{
}}\preformatted{## rxode2 2.0.14.9000 model named rx_85848c9248e14e8cbf9a9b4a606b2010 model (ready).
## x$state: depot, center
## x$stateExtra: cp
## x$params: tka, tcl, tv, add.sd, eta.ka, eta.cl, eta.v, rxerr.cp
@@ -336,7 +336,7 @@ compilation model.
mod$simulationIniModel
}\if{html}{\out{
}}\preformatted{## rxode2 2.0.14.9000 model named rx_3696701c79e711bcf4b2c8ac921b3f65 model (ready).
+\if{html}{\out{
}}\preformatted{## rxode2 2.0.14.9000 model named rx_40b4a6f44b577c0e14f674ccc10f618e model (ready).
## x$state: depot, center
## x$stateExtra: cp
## x$params: tka, tcl, tv, add.sd, eta.ka, eta.cl, eta.v, rxerr.cp
diff --git a/tests/testthat/test-piping-ini.R b/tests/testthat/test-piping-ini.R
index b7f655d0a..a0b63fedf 100644
--- a/tests/testthat/test-piping-ini.R
+++ b/tests/testthat/test-piping-ini.R
@@ -145,6 +145,7 @@ test_that(".iniSimplifyAssignArrow", {
})
test_that("piping with ini can update reorder parameters (rxode2/issues#352)", {
+
mod <- function() {
ini({
a <- 1
@@ -157,7 +158,9 @@ test_that("piping with ini can update reorder parameters (rxode2/issues#352)", {
b ~ add(addSd)
})
}
+
ui <- rxode2(mod)
+
# No modification
expect_equal(ui$iniDf$name, c("a", "b", "c", "addSd"))
# b to the top by number
@@ -170,6 +173,9 @@ test_that("piping with ini can update reorder parameters (rxode2/issues#352)", {
expect_equal(suppressMessages(ini(ui, b <- 1, append = TRUE))$iniDf$name, c("a", "c", "addSd", "b"))
# b to the bottom by name
expect_equal(suppressMessages(ini(ui, b <- 1, append = "addSd"))$iniDf$name, c("a", "c", "addSd", "b"))
+
+ expect_equal(suppressMessages(ini(ui, b <- 1, append = addSd))$iniDf$name, c("a", "c", "addSd", "b"))
+
# b after c
expect_equal(suppressMessages(ini(ui, b <- 1, append = "c"))$iniDf$name, c("a", "c", "b", "addSd"))
# a and b after c; counter-intuitive: the order of a and b are reversed
@@ -180,11 +186,16 @@ test_that("piping with ini can update reorder parameters (rxode2/issues#352)", {
regexp = "parameter 'b' set to be moved after itself, no change in order made"
)
+ expect_error(
+ ini(ui, b <- 1, append = d/dt(fun)),
+ "append")
+
# Invalid parameter is correctly caught
expect_error(
ini(ui, b <- 1, append = "foo"),
"append"
)
+
})
test_that(".iniAddCovarianceBetweenTwoEtaValues", {
@@ -275,9 +286,10 @@ test_that(".iniHandleAppend", {
b ~ add(addSd)
})
}
+
expect_error(
ini(mod, a <- 1, append=factor("A")),
- regexp = "'append' must be NULL, logical, numeric, or character"
+ regexp = "'append' must be NULL, logical, numeric, or character/expression of variable in model"
)
expect_error(
ini(mod, q <- 1, append=0),
diff --git a/tests/testthat/test-ui-piping.R b/tests/testthat/test-ui-piping.R
index 2aac8fe55..0103e6420 100644
--- a/tests/testthat/test-ui-piping.R
+++ b/tests/testthat/test-ui-piping.R
@@ -1428,6 +1428,18 @@ rxTest({
expect_true("cp1" %in% f2$mv0$lhs)
expect_equal(f2$lstExpr[[length(f2$lstExpr)]], quote(cp1 <- cp))
+ f <- rxode2(ocmt)
+ f2 <- f %>% model(cp1 <- cp, append=Inf)
+
+ expect_true("cp1" %in% f2$mv0$lhs)
+ expect_equal(f2$lstExpr[[length(f2$lstExpr)]], quote(cp1 <- cp))
+
+ f <- rxode2(ocmt)
+ f2 <- f %>% model(cp1 <- cp, append=100)
+
+ expect_true("cp1" %in% f2$mv0$lhs)
+ expect_equal(f2$lstExpr[[length(f2$lstExpr)]], quote(cp1 <- cp))
+
f2 <- f %>% model(f2 <- 3 * 2, append=NA)
expect_true("f2" %in% f2$mv0$lhs)
expect_equal(f2$lstExpr[[1]], quote(f2 <- 3 * 2))
@@ -2037,6 +2049,17 @@ test_that("piping append", {
expect_equal(mod5$theta, c(tka = 0.45, tcl = 1, tv = 3.45, add.sd = 0.7))
+ mod5 <- mod |>
+ model({
+ PD <- 1-emax*cp/(ec50+cp)
+ ##
+ effect(0) <- e0
+ kin <- e0*kout
+ d/dt(effect) <- kin*PD -kout*effect
+ }, append="d/dt(center)")
+
+ expect_equal(mod5$theta, c(tka = 0.45, tcl = 1, tv = 3.45, add.sd = 0.7))
+
mod6 <- mod5 |>
model({
emax <- exp(temax)
@@ -2057,6 +2080,46 @@ test_that("piping append", {
eta.e0 ~ 1
}))
+ mod6 <- mod5 |>
+ model({
+ emax <- exp(temax)
+ e0 <- exp(te0 + eta.e0)
+ ec50 <- exp(tec50)
+ kin <- exp(tkin)
+ kout <- exp(tkout)
+ }, append=FALSE)
+
+ expect_equal(
+ mod6$omega,
+ lotri({
+ eta.cl ~ 0.3
+ eta.v ~ 0.1
+ eta.e0 ~ 1
+ }))
+
+ expect_equal(mod6$theta,
+ c(tka = 0.45, tcl = 1, tv = 3.45, add.sd = 0.7, temax = 1, te0 = 1, tec50 = 1, tkin = 1, tkout = 1))
+
+ mod6 <- mod5 |>
+ model({
+ emax <- exp(temax)
+ e0 <- exp(te0 + eta.e0)
+ ec50 <- exp(tec50)
+ kin <- exp(tkin)
+ kout <- exp(tkout)
+ }, append=0)
+
+ expect_equal(
+ mod6$omega,
+ lotri({
+ eta.cl ~ 0.3
+ eta.v ~ 0.1
+ eta.e0 ~ 1
+ }))
+
+ expect_equal(mod6$theta,
+ c(tka = 0.45, tcl = 1, tv = 3.45, add.sd = 0.7, temax = 1, te0 = 1, tec50 = 1, tkin = 1, tkout = 1))
+
# make sure auto model piping turns off
withr::with_options(list(rxode2.autoVarPiping=FALSE),