Merge branch 'main' into mmrm-extension

vincentarelbundock · Aug 31, 2024 · 9dd18c0 · 9dd18c0
2 parents c6730c4 + 5497229
commit 9dd18c0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: marginaleffects
 Title: Predictions, Comparisons, Slopes, Marginal Means, and Hypothesis Tests
-Version: 0.21.0.22
+Version: 0.22.0
 Authors@R: 
     c(person(given = "Vincent",
              family = "Arel-Bundock",
@@ -31,10 +31,9 @@ Imports:
     checkmate,
     data.table,
     generics,
-    insight (>= 0.19.7),
+    insight (>= 0.20.3),
     methods,
     rlang,
-    utils,
     Rcpp (>= 1.0.0)
 Enhances:
     knitr
@@ -165,7 +164,7 @@ Suggests:
     tidyr,
     tidyverse,
     tinysnapshot,
-    tinytable (>= 0.2.0),
+    tinytable (>= 0.4.0),
     tinytest,
     titanic,
     truncreg,

diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,6 @@
 # News
 
-## Development
+## 0.22.0
 
 Breaking changes:
 

diff --git a/R/methods_glmtoolbox.R b/R/methods_glmtoolbox.R
@@ -3,7 +3,7 @@
 #' @export
 get_coef.glmgee <- function(model, ...) {
     b <- model$coefficients
-    b <- setNames(as.vector(b), row.names(b))
+    b <- stats::setNames(as.vector(b), row.names(b))
     return(b)
 }
 
@@ -21,7 +21,7 @@ set_coef.glmgee <- function(model, coefs, ...) {
 #' @rdname get_predict
 #' @export
 get_predict.glmgee <- function(model, newdata, ...) {
-    Yhat <- predict(model, newdata = newdata, type = "response")
+    Yhat <- stats::predict(model, newdata = newdata, type = "response")
     out <- data.frame(
         rowid = seq_len(nrow(Yhat)),
         estimate = as.vector(Yhat))