Skip to content

Commit

Permalink
don't partialy match effect in model_parameters() (#641)
Browse files Browse the repository at this point in the history
* don't partialy match effect in parameters

* Build favicons for pkgdown website locally

easystats/easystats#407
  • Loading branch information
mattansb authored May 27, 2024
1 parent 43c6d0c commit a065eae
Show file tree
Hide file tree
Showing 10 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions R/eta_squared-main.R
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,7 @@ cohens_f_squared <- function(model,
include_intercept = include_intercept
)

attr(out, "anova_type") <- tryCatch(attr(parameters::model_parameters(model, verbose = FALSE, effects = "fixed"), "anova_type"),
attr(out, "anova_type") <- tryCatch(attr(parameters::model_parameters(model, verbose = FALSE, effects = "fixed", effectsize_type = NULL), "anova_type"),
error = function(...) 1
)
attr(out, "approximate") <- TRUE
Expand Down Expand Up @@ -864,7 +864,7 @@ cohens_f_squared <- function(model,

# TODO this should be in .anova_es.anvoa
# TODO the aoc method should convert to an anova table, then pass to anova
params <- parameters::model_parameters(model, verbose = verbose, effects = "fixed")
params <- parameters::model_parameters(model, verbose = verbose, effects = "fixed", effectsize_type = NULL)
out <- .es_aov_simple(as.data.frame(params),
type = type,
partial = partial, generalized = generalized,
Expand All @@ -890,7 +890,7 @@ cohens_f_squared <- function(model,
verbose = TRUE,
include_intercept = FALSE,
...) {
params <- parameters::model_parameters(model, verbose = verbose, effects = "fixed")
params <- parameters::model_parameters(model, verbose = verbose, effects = "fixed", effectsize_type = NULL)
anova_type <- attr(params, "anova_type")
params <- as.data.frame(params)

Expand Down
2 changes: 1 addition & 1 deletion R/eta_squared-methods.R
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
ci = 0.95, alternative = "greater",
verbose = TRUE,
...) {
params <- parameters::model_parameters(model, verbose = verbose, effects = "fixed")
params <- parameters::model_parameters(model, verbose = verbose, effects = "fixed", effectsize_type = NULL)
anova_type <- attr(params, "anova_type")

params <- split(params, factor(params$Response, levels = unique(params$Response))) # make sure row order is not changed
Expand Down
File renamed without changes.
Binary file added pkgdown/favicon/apple-touch-icon-120x120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pkgdown/favicon/apple-touch-icon-60x60.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pkgdown/favicon/apple-touch-icon-76x76.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pkgdown/favicon/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pkgdown/favicon/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pkgdown/favicon/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pkgdown/favicon/favicon.ico
Binary file not shown.

0 comments on commit a065eae

Please sign in to comment.