Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix due to changes in {marginaleffects} #631

Merged
merged 51 commits into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
3d578a9
Fix due to changes in {marginaleffects}
strengejacke Jan 28, 2025
a7e1f7e
fix
strengejacke Jan 29, 2025
db591cf
fix
strengejacke Jan 29, 2025
90a9fe9
Update test-test_predictions_emmeans.R
strengejacke Jan 30, 2025
be278ba
fix
strengejacke Jan 30, 2025
4eed5f8
Update DESCRIPTION
strengejacke Jan 31, 2025
02b597e
fix
strengejacke Jan 31, 2025
428f2f9
fix
strengejacke Jan 31, 2025
bd2d99c
use modelbased
strengejacke Feb 1, 2025
1099271
remove
strengejacke Feb 1, 2025
a509877
update
strengejacke Feb 4, 2025
894512a
update
strengejacke Feb 4, 2025
e79d6f9
fix
strengejacke Feb 4, 2025
fc778c2
update tests
strengejacke Feb 4, 2025
4f107af
update snapshots
strengejacke Feb 4, 2025
5c43ce0
update snaps
strengejacke Feb 4, 2025
2951fa3
Update test_predictions.R
strengejacke Feb 4, 2025
d7cbaed
update tests
strengejacke Feb 4, 2025
7534dc9
update snaps
strengejacke Feb 4, 2025
94958fd
update
strengejacke Feb 4, 2025
5dcfd23
Update test-print_test_predictions-ordinal.R
strengejacke Feb 4, 2025
652bdd9
remove johnson_neyman temporarily
strengejacke Feb 4, 2025
56c85f9
update
strengejacke Feb 4, 2025
99ba887
add back
strengejacke Feb 4, 2025
ca8c300
fix
strengejacke Feb 4, 2025
2210774
fix
strengejacke Feb 5, 2025
f35c988
update tests
strengejacke Feb 5, 2025
067d05e
version
strengejacke Feb 5, 2025
94c6832
update tests
strengejacke Feb 5, 2025
ceb5959
Update test-ggaverage.R
strengejacke Feb 5, 2025
1f93ff5
update tests
strengejacke Feb 5, 2025
2aa4d3b
fix
strengejacke Feb 5, 2025
b697b54
fix
strengejacke Feb 5, 2025
b8bfd39
Update pool_comparisons.R
strengejacke Feb 5, 2025
f1597bc
update RD
strengejacke Feb 5, 2025
d61819f
fix
strengejacke Feb 5, 2025
b884f13
update tests
strengejacke Feb 5, 2025
b4d0e07
Update test-test_predictions_emmeans.R
strengejacke Feb 5, 2025
6efb789
Update test-test_predictions_emmeans.R
strengejacke Feb 5, 2025
e0edb3d
fix tests
strengejacke Feb 5, 2025
a2efa8c
Update test_predictions-margin.md
strengejacke Feb 5, 2025
2c89ec2
Update test_predictions_ggeffects.md
strengejacke Feb 5, 2025
bbbc4bd
update
strengejacke Feb 5, 2025
60773fd
update
strengejacke Feb 5, 2025
a3f2f8a
update tests
strengejacke Feb 5, 2025
81a8564
snaps
strengejacke Feb 5, 2025
6652a00
(re)move vignettes
strengejacke Feb 5, 2025
cc3dbf3
Update test-test_predictions-formula.R
strengejacke Feb 5, 2025
1cecff0
Update test-johnson_neyman.R
strengejacke Feb 5, 2025
0a8e106
Update test-parsnip.R
strengejacke Feb 5, 2025
cfbd777
docs
strengejacke Feb 5, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ $RECYCLE.BIN/
*.msi
*.msm
*.msp
ggeffects.Rproj
.Rproj.user
inst/doc
revdep
Expand Down
6 changes: 4 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Package: ggeffects
Type: Package
Encoding: UTF-8
Title: Create Tidy Data Frames of Marginal Effects for 'ggplot' from Model Outputs
Version: 2.1.0
Version: 2.1.0.2
Authors@R: c(
person("Daniel", "Lüdecke", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0002-8895-3206")),
person("Frederik", "Aust", role = "ctb", comment = c(ORCID = "0000-0003-4900-788X")),
Expand Down Expand Up @@ -41,6 +41,7 @@ Suggests:
clubSandwich,
dfidx,
effects (>= 4.2-2),
effectsize (>= 1.0.0),
emmeans (>= 1.8.9),
fixest,
gam,
Expand All @@ -62,7 +63,8 @@ Suggests:
lme4 (>= 1.1-35),
logistf,
logitr,
marginaleffects (>= 0.24.0),
marginaleffects (>= 0.25.0),
modelbased (>= 0.9.0),
MASS,
Matrix,
mice,
Expand Down
3 changes: 0 additions & 3 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,10 @@ S3method(get_predictions,zeroinfl)
S3method(get_predictions,zerotrunc)
S3method(plot,ggalleffects)
S3method(plot,ggeffects)
S3method(plot,ggjohnson_neyman)
S3method(plot,ggjohnson_neyman_numcat)
S3method(plot,see_equivalence_test_ggeffects)
S3method(print,ggcomparisons)
S3method(print,ggeffects)
S3method(print,ggjohnson_neyman)
S3method(print,ggjohnson_neyman_numcat)
S3method(print_html,ggcomparisons)
S3method(print_html,ggeffects)
S3method(print_md,ggcomparisons)
Expand Down
12 changes: 7 additions & 5 deletions R/format.R
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
#' subgroups in the table output.
#' @param collapse_ci Logical, if `TRUE`, the columns with predicted values and
#' confidence intervals are collapsed into one column, e.g. `Predicted (95% CI)`.
#' @param n Number of rows to print per subgroup. If `NULL`, a default number
#' of rows is printed, depending on the number of subgroups.
#' @param collapse_tables Logical, if `TRUE`, all tables are combined into one.
#' The tables are not split by further focal terms, but rather are added as
#' columns. Only works when there is more than one focal term.
#' @param collapse_p Logical, if `TRUE`, the columns with predicted values and
#' p-values are collapsed into one column, where significant p-values are
#' indicated as asterisks.
Expand All @@ -14,11 +19,6 @@
#' useful when comparing multiple focal terms, e.g. `education = low-high` and
#' `gender = male-female` are combined into `first = low-male` and
#' `second = high-female`.
#' @param n Number of rows to print per subgroup. If `NULL`, a default number
#' of rows is printed, depending on the number of subgroups.
#' @param collapse_tables Logical, if `TRUE`, all tables are combined into one.
#' The tables are not split by further focal terms, but rather are added as
#' columns. Only works when there is more than one focal term.
#'
#' @rdname print
#' @export
Expand All @@ -30,7 +30,7 @@
digits = 2,
collapse_ci = FALSE,
collapse_tables = FALSE,
n,

Check warning on line 33 in R/format.R

View workflow job for this annotation

GitHub Actions / lint

file=R/format.R,line=33,col=30,[function_argument_linter] Arguments without defaults should come before arguments with defaults.
...) {
# we need to determine how many rows to print. this requires the original
# data frame including attributes, that's why this code comes first
Expand Down Expand Up @@ -209,6 +209,7 @@
}



#' @rdname print
#' @export
format.ggcomparisons <- function(x,
Expand Down Expand Up @@ -370,6 +371,7 @@
}



.nrows_to_print <- function(x, n) {
# if we have groups, show n rows per group
.n <- 1
Expand Down
Loading
Loading