Fix cov <- NULL and cov ~ NULL

nlmixr2 · Sep 7, 2024 · bd88b75 · bd88b75
1 parent 3e491c2
commit bd88b75
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/R/piping-ini.R b/R/piping-ini.R
@@ -625,9 +625,12 @@
   # downstream operations
   expr <- .iniSimplifyAssignArrow(expr)
 
-  if (.matchesLangTemplate(expr, str2lang(".name <- NULL"))) {
-    expr <- as.call(list(quote(`-`), expr[[2]]))
-  } else if (.matchesLangTemplate(expr, str2lang(".name ~ NULL"))) {
+  if (.matchesLangTemplate(expr, str2lang(".name <- NULL")) ||
+        .matchesLangTemplate(expr, str2lang(".name ~ NULL")) ||
+        .matchesLangTemplate(expr, str2lang("cov(.name, .name) <- NULL")) ||
+        .matchesLangTemplate(expr, str2lang("cor(.name, .name) <- NULL")) ||
+        .matchesLangTemplate(expr, str2lang("cov(.name, .name) ~ NULL")) ||
+        .matchesLangTemplate(expr, str2lang("cor(.name, .name) ~ NULL"))) {
     expr <- as.call(list(quote(`-`), expr[[2]]))
   }
 

diff --git a/R/piping.R b/R/piping.R
@@ -392,7 +392,7 @@
     } else if (identical(.quoted[[1]], quote(`as.formula`))) {
       .quoted <- .quoted[[2]]
     } else if (identical(.quoted[[1]], quote(`~`))) {
-      if (length(.quoted) == 3L) {
+      if (length(.quoted) == 3L && !is.null(.quoted[[3]])) {
         .quoted[[3]] <- .iniSimplifyFixUnfix(.quoted[[3]])
         if (identical(.quoted[[3]], quote(`fix`)) ||
               identical(.quoted[[3]], quote(`unfix`))) {

diff --git a/tests/testthat/test-piping-ini.R b/tests/testthat/test-piping-ini.R
@@ -948,6 +948,7 @@ test_that("ini(diag) and ini(-cov()) tests", {
                }))
 
   tmp <- mod2 %>% ini(cor(lcl, lvc) <- NULL)
+
   expect_equal(tmp$omega,
                lotri({
                  lvc ~ 3.45
-Original file line number
+Diff line change
@@ Expand Up / @@ -948,6 +948,7 @@ test_that("ini(diag) and ini(-cov()) tests", { @@
                    }))
       tmp <- mod2 %>% ini(cor(lcl, lvc) <- NULL)
       expect_equal(tmp$omega,
                    lotri({
                      lvc ~ 3.45
@@ Expand Down @@