diff --git a/NEWS.md b/NEWS.md index ebed70b9f..451ffaa4e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# ggeffects 1.6.1 +# ggeffects 1.7.0 ## Breaking diff --git a/cran-comments.md b/cran-comments.md index 8c78e83d1..fa6f2d4c2 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1 +1 @@ -This release fixes issues related to the last *marginaleffects* updates. \ No newline at end of file +Maintainance release. \ No newline at end of file diff --git a/tests/testthat/test-brms-ppd.R b/tests/testthat/test-brms-ppd.R index 4333ad611..13167b5ff 100644 --- a/tests/testthat/test-brms-ppd.R +++ b/tests/testthat/test-brms-ppd.R @@ -23,19 +23,19 @@ test_that("ggpredict, brms-ppd", { iter = 500, refresh = 0 )) - expect_s3_class(suppressWarnings(ggpredict(m1, ppd = TRUE)), c("ggalleffects", "list")) - expect_s3_class(suppressWarnings(ggpredict(m1, "x", ppd = TRUE)), "data.frame") + expect_s3_class(suppressWarnings(ggpredict(m1, interval = "prediction")), c("ggalleffects", "list")) + expect_s3_class(suppressWarnings(ggpredict(m1, "x", interval = "prediction")), "data.frame") expect_s3_class(ggpredict(m1, interval = "prediction"), c("ggalleffects", "list")) expect_s3_class(ggpredict(m1, "x", interval = "prediction"), "data.frame") - expect_s3_class(suppressWarnings(ggpredict(m2, ppd = TRUE)), c("ggalleffects", "list")) - expect_s3_class(suppressWarnings(ggpredict(m2, "x", ppd = TRUE)), "data.frame") - expect_s3_class(ggpredict(m1, ppd = FALSE), c("ggalleffects", "list")) - expect_s3_class(ggpredict(m1, "x", ppd = FALSE), "data.frame") - expect_s3_class(ggpredict(m2, ppd = FALSE), c("ggalleffects", "list")) - expect_s3_class(ggpredict(m2, "x", ppd = FALSE), "data.frame") + expect_s3_class(suppressWarnings(ggpredict(m2, interval = "prediction")), c("ggalleffects", "list")) + expect_s3_class(suppressWarnings(ggpredict(m2, "x", interval = "prediction")), "data.frame") + expect_s3_class(ggpredict(m1, interval = "confidence"), c("ggalleffects", "list")) + expect_s3_class(ggpredict(m1, "x", interval = "confidence"), "data.frame") + expect_s3_class(ggpredict(m2, interval = "confidence"), c("ggalleffects", "list")) + expect_s3_class(ggpredict(m2, "x", interval = "confidence"), "data.frame") set.seed(123) - out1 <- suppressWarnings(ggpredict(m1, "x", ppd = TRUE)) + out1 <- suppressWarnings(ggpredict(m1, "x", interval = "prediction")) set.seed(123) out2 <- ggpredict(m1, "x", interval = "prediction") expect_equal(out1$predicted, out2$predicted, tolerance = 1e-3) diff --git a/tests/testthat/test-rstanarm-ppd.R b/tests/testthat/test-rstanarm-ppd.R index 8a70ca541..72c512b2e 100644 --- a/tests/testthat/test-rstanarm-ppd.R +++ b/tests/testthat/test-rstanarm-ppd.R @@ -30,17 +30,17 @@ test_that("ggpredict, rstanarm-ppd", { refresh = 0 )) - expect_s3_class(suppressWarnings(ggpredict(m1, ppd = TRUE)), "ggalleffects") - expect_s3_class(suppressWarnings(ggpredict(m1, "x", ppd = TRUE)), "data.frame") - expect_s3_class(suppressWarnings(ggpredict(m2, ppd = TRUE)), "ggalleffects") - expect_s3_class(suppressWarnings(ggpredict(m2, "x", ppd = TRUE)), "data.frame") - expect_error(ggpredict(m1, ppd = FALSE)) - expect_error(ggpredict(m1, "x", ppd = FALSE)) - expect_s3_class(ggpredict(m2, ppd = FALSE), "ggalleffects") - expect_s3_class(ggpredict(m2, "x", ppd = FALSE), "data.frame") + expect_s3_class(suppressWarnings(ggpredict(m1, interval = "prediction")), "ggalleffects") + expect_s3_class(suppressWarnings(ggpredict(m1, "x", interval = "prediction")), "data.frame") + expect_s3_class(suppressWarnings(ggpredict(m2, interval = "prediction")), "ggalleffects") + expect_s3_class(suppressWarnings(ggpredict(m2, "x", interval = "prediction")), "data.frame") + expect_error(ggpredict(m1, interval = "confidence")) + expect_error(ggpredict(m1, "x", interval = "confidence")) + expect_s3_class(ggpredict(m2, interval = "confidence"), "ggalleffects") + expect_s3_class(ggpredict(m2, "x", interval = "confidence"), "data.frame") set.seed(123) - out1 <- suppressWarnings(ggpredict(m1, "x", ppd = TRUE)) + out1 <- suppressWarnings(ggpredict(m1, "x", interval = "prediction")) set.seed(123) out2 <- suppressWarnings(ggpredict(m1, "x", interval = "prediction")) expect_equal(out1$predicted, out2$predicted, tolerance = 1e-3)