Skip to content

Commit

Permalink
update namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
strengejacke committed Oct 12, 2020
1 parent a8e9e0a commit 971ddcb
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ importFrom(effectsize,interpret_d)
importFrom(effectsize,interpret_direction)
importFrom(effectsize,interpret_ess)
importFrom(effectsize,interpret_odds)
importFrom(effectsize,interpret_omega_squared)
importFrom(effectsize,interpret_p)
importFrom(effectsize,interpret_r)
importFrom(effectsize,interpret_r2)
Expand Down
8 changes: 6 additions & 2 deletions R/report.aov.R
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
#' r <- report(model)
#' r
#' table_short(r)
#'
#' @importFrom insight format_value format_p
#' @importFrom parameters model_parameters
#' @importFrom effectsize interpret_p
#' @export
report.aov <- function(model, interpretation = "field2013", omega_squared = "partial", eta_squared = NULL, epsilon_squared = NULL, ...) {
table_full <- parameters::model_parameters(model, omega_squared = omega_squared, eta_squared = eta_squared, epsilon_squared = epsilon_squared, ...)
Expand Down Expand Up @@ -55,7 +57,7 @@ report.aov <- function(model, interpretation = "field2013", omega_squared = "par
") = ",
insight::format_value(parameters$`F`),
", ",
parameters::format_p(parameters$p)
insight::format_p(parameters$p)
)

# Effect size
Expand Down Expand Up @@ -100,6 +102,8 @@ report.aovlist <- report.aov
# internals ---------------------------------------------------------------


#' @importFrom effectsize interpret_omega_squared
#' @importFrom insight format_value
#' @keywords internal
.format_aov_effsize <- function(parameters, interpretation = "field2013") {
if ("Omega_Sq_partial" %in% names(parameters)) {
Expand Down
2 changes: 1 addition & 1 deletion R/report_parameters.R
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ report_parameters <- function(model, parameters, prefix = " - ", ...) {
# bf[bf < 1] <- 1 / bf[bf < 1]
#
# paste0(
# parameters::format_bf(bf, name = dir),
# insight::format_bf(bf, name = dir),
# ", considered ",
# report::interpret_bf(ori_bf, include_value = FALSE, ...),
# " the effect"
Expand Down
1 change: 0 additions & 1 deletion man/report.aov.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 comments on commit 971ddcb

@strengejacke
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DominiqueMakowski This introduced some minor merge conflicts in the dev-branch... 😱 But I'm sure you know which code parts to keep, or revert the code and add the imports correctly. 😬

@strengejacke
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, should be resolved.

Please sign in to comment.