Prepare CRAN release (#1000)

* Prepare CRAN release

* fix

* version

* fix

* update rbuildignore

Author: strengejacke

.Rbuildignore

@@ -20,3 +20,4 @@
 \.lintr$
 ^CRAN-SUBMISSION$
 ^Rplots.pdf$
+^tests/testthat/_snaps/.

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: insight
 Title: Easy Access to Model Information for Various Model Objects
-Version: 1.0.1.7
+Version: 1.0.2
 Authors@R:
     c(person(given = "Daniel",
              family = "Lüdecke",
@@ -127,7 +127,7 @@ Suggests:
     gee,
     geepack,
     geoR,
-    ggeffects,
+    ggeffects (>= 2.2.0),
     GLMMadaptive,
     glmmTMB (>= 1.1.10),
     glmtoolbox,
@@ -148,7 +148,7 @@ Suggests:
     lmtest,
     logistf,
     logitr,
-    marginaleffects (>= 0.24.0),
+    marginaleffects (>= 0.25.0),
     MASS,
     Matrix,
     mclogit,
@@ -163,7 +163,7 @@ Suggests:
     mice (>= 3.17.0),
     mlogit,
     mmrm,
-    modelbased,
+    modelbased (>= 0.9.0),
     multgee,
     MuMIn,
     nestedLogit,

R/get_parameters_others.R

@@ -390,7 +390,8 @@ get_parameters.deltaMethod <- function(x, ...) {
 
 #' @export
 get_parameters.ggcomparisons <- function(x, merge_parameters = FALSE, ...) {
-  estimate_pos <- which(colnames(x) == attr(x, "estimate_name"))
+  estimate_name <- intersect(colnames(x), c(attr(x, "coef_name"), "Difference", "Mean", "Ratio"))[1]
+  estimate_pos <- which(colnames(x) == estimate_name)
   params <- x[, seq_len(estimate_pos - 1), drop = FALSE]
 
   if (isTRUE(merge_parameters) && ncol(params) > 1L) {

R/get_statistic.R

@@ -1687,14 +1687,14 @@ get_statistic.emm_list <- function(x, ci = 0.95, adjust = "none", ...) {
 
 #' @export
 get_statistic.ggcomparisons <- function(x, merge_parameters = FALSE, ...) {
-  estimate_pos <- which(colnames(x) == attr(x, "estimate_name"))
   if (isTRUE(merge_parameters)) {
     params <- get_parameters(x, merge_parameters = TRUE)["Parameter"]
   } else {
-    params <- x[, seq_len(estimate_pos - 1), drop = FALSE]
+    params <- get_parameters(x, merge_parameters = FALSE)[c("Level1", "Level2")]
   }
 
-  stat <- .safe(x[[estimate_pos]] / attributes(x)$standard_error)
+  stat_column <- intersect(colnames(x), c("t", "z", "Statistic"))[1]
+  stat <- x[[stat_column]]
   if (is.null(stat)) {
     return(NULL)
   }

tests/testthat/test-ggeffects.R

@@ -4,115 +4,67 @@ test_that("get_parameters, hypothesis_test", {
   data(iris)
   mgg <- lm(Sepal.Width ~ Sepal.Length * Species, data = iris)
 
-  out <- ggeffects::hypothesis_test(
-    ggeffects::ggpredict(mgg, c("Sepal.Length", "Species")),
-    test = NULL
-  )
+  out <- ggeffects::test_predictions(mgg, "Sepal.Length", by = "Species")
 
   param <- get_parameters(out)
-  expect_named(param, c("Sepal.Length", "Species", "Estimate"))
-  expect_identical(
-    param$Sepal.Length,
-    c("slope", "slope", "slope")
-  )
+  expect_named(param, c("Level1", "Level2", "Estimate"))
   expect_identical(
-    param$Species,
-    structure(1:3, levels = c("setosa", "versicolor", "virginica"), class = "factor")
+    as.character(param$Level1),
+    c("versicolor", "virginica", "virginica")
   )
   expect_equal(
     param$Estimate,
-    c(0.79853, 0.31972, 0.23189),
+    c(-0.47881, -0.56664, -0.08783),
     tolerance = 1e-3
   )
 
   param <- get_parameters(out, merge_parameters = TRUE)
   expect_named(param, c("Parameter", "Estimate"))
   expect_identical(
-    param$Parameter,
+    as.character(param$Parameter),
     c(
-      "Sepal.Length [slope], Species [setosa]", "Sepal.Length [slope], Species [versicolor]",
-      "Sepal.Length [slope], Species [virginica]"
+      "Level1 [versicolor], Level2 [setosa]", "Level1 [virginica], Level2 [setosa]",
+      "Level1 [virginica], Level2 [versicolor]"
     )
   )
   expect_equal(
     param$Estimate,
-    c(0.79853, 0.31972, 0.23189),
+    c(-0.47881, -0.56664, -0.08783),
     tolerance = 1e-3
   )
-
-  out <- ggeffects::hypothesis_test(ggeffects::ggpredict(mgg, c("Sepal.Length", "Species")))
-
-  param <- get_parameters(out)
-  expect_named(param, c("Sepal.Length", "Species", "Estimate"))
-  expect_identical(
-    param$Sepal.Length,
-    c("slope", "slope", "slope")
-  )
-  expect_equal(
-    param$Estimate,
-    c(0.47881, 0.56664, 0.08783),
-    tolerance = 1e-3
-  )
-
-  param <- get_parameters(out, merge_parameters = TRUE)
-  expect_named(param, c("Parameter", "Estimate"))
 })
 
 
 test_that("get_statistic, hypothesis_test", {
   data(iris)
   mgg <- lm(Sepal.Width ~ Sepal.Length * Species, data = iris)
 
-  out <- ggeffects::hypothesis_test(
-    ggeffects::ggpredict(mgg, c("Sepal.Length", "Species")),
-    test = NULL
-  )
+  out <- ggeffects::hypothesis_test(mgg, "Sepal.Length", by = "Species")
 
   param <- get_statistic(out)
-  expect_named(param, c("Sepal.Length", "Species", "Statistic"))
-  expect_identical(
-    param$Sepal.Length,
-    c("slope", "slope", "slope")
-  )
-  expect_identical(
-    param$Species,
-    structure(1:3, levels = c("setosa", "versicolor", "virginica"), class = "factor")
-  )
+  expect_named(param, c("Level1", "Level2", "Statistic"))
   expect_equal(
     param$Statistic,
-    c(7.23551, 4.24211, 3.79015),
+    c(-3.58238, -4.48999, -0.90468),
     tolerance = 1e-3
   )
+  expect_identical(
+    as.character(param$Level1),
+    c("versicolor", "virginica", "virginica")
+  )
 
   param <- get_statistic(out, merge_parameters = TRUE)
   expect_named(param, c("Parameter", "Statistic"))
   expect_identical(
-    param$Parameter,
+    as.character(param$Parameter),
     c(
-      "Sepal.Length [slope], Species [setosa]", "Sepal.Length [slope], Species [versicolor]",
-      "Sepal.Length [slope], Species [virginica]"
+      "Level1 [versicolor], Level2 [setosa]", "Level1 [virginica], Level2 [setosa]",
+      "Level1 [virginica], Level2 [versicolor]"
     )
   )
   expect_equal(
     param$Statistic,
-    c(7.23551, 4.24211, 3.79015),
+    c(-3.58238, -4.48999, -0.90468),
     tolerance = 1e-3
   )
-
-  out <- ggeffects::hypothesis_test(ggeffects::ggpredict(mgg, c("Sepal.Length", "Species")))
-
-  param <- get_statistic(out)
-  expect_named(param, c("Sepal.Length", "Species", "Statistic"))
-  expect_identical(
-    param$Sepal.Length,
-    c("slope", "slope", "slope")
-  )
-  expect_equal(
-    param$Statistic,
-    c(3.58262, 4.48915, 0.90475),
-    tolerance = 1e-3
-  )
-
-  param <- get_statistic(out, merge_parameters = TRUE)
-  expect_named(param, c("Parameter", "Statistic"))
 })