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

WIP: Group summary stat #6066

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ Collate:
'stat-smooth-methods.R'
'stat-smooth.R'
'stat-sum.R'
'stat-summarise.R'
'stat-summary-2d.R'
'stat-summary-bin.R'
'stat-summary-hex.R'
Expand Down
2 changes: 2 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ export(StatSf)
export(StatSfCoordinates)
export(StatSmooth)
export(StatSum)
export(StatSummarise)
export(StatSummary)
export(StatSummary2d)
export(StatSummaryBin)
Expand Down Expand Up @@ -686,6 +687,7 @@ export(stat_sf_coordinates)
export(stat_smooth)
export(stat_spoke)
export(stat_sum)
export(stat_summarise)
export(stat_summary)
export(stat_summary2d)
export(stat_summary_2d)
Expand Down
129 changes: 129 additions & 0 deletions R/stat-summarise.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
#' Arbitrary summaries by group
#'
#' `stat_summarise()` handles arbitrary summaries by group. Unlike
#' [`stat_summary()`], it does not automatically summarise by `x`.
#'
#' @inheritParams stat_identity
#' @param fun A function that is given the complete data per group and should
#' return a data.frame with variables compatible with the layer's `geom`
#' argument. Defaults to `express_group()` which will evaluate
#' [data-masked][rlang::args_data_masking] expressions passed to `fun.args`.
#' @param fun.args Optional additional arguments to pass to `fun`. When
#' `fun = express_group` (default), can be a list of expressions created by
#' `vars()`.
#' @eval rd_aesthetics("stat", "summarise")
#' @export
#'
#' @examples
#' # Using a helper summary function
#' my_summary_fun <- function(data) {
#' data.frame(
#' x = min(data$x) - 0.5,
#' xend = max(data$x) + 0.5,
#' y = mean(data$y)
#' )
#' }
#'
#' ggplot(mpg, aes(drv, displ)) +
#' geom_jitter(aes(colour = drv)) +
#' stat_summarise(
#' geom = "segment",
#' fun = my_summary_fun
#' )
#'
#' # Making the same summary using the `exprs` argument
#' ggplot(mpg, aes(drv, displ)) +
#' geom_jitter(aes(colour = drv)) +
#' stat_summarise(
#' geom = "segment",
#' fun.args = vars(
#' # Note: we use `xend` first to not mutate `x` too soon
#' xend = max(x) + 0.5,
#' x = min(x) - 0.5,
#' y = mean(y)
#' )
#' )
#'
#' # You can use a temporary variable that needn't conform to data.frame columns
#' # as long as it is removed afterwards
#' ggplot(mpg, aes(displ, colour = drv)) +
#' stat_summarise(
#' geom = "line",
#' fun.args = vars(
#' dens = density(x), # non-vector temporary variable
#' x = dens$x,
#' y = dens$y,
#' dens = NULL # deleting the temporary variable
#' )
#' )
stat_summarise <- function(
mapping = NULL,
data = NULL,
geom = "point",
position = "identity",
...,
fun = express_group,
fun.args = list(),
na.rm = FALSE,
show.legend = NA,
inherit.aes = TRUE
) {

layer(
data = data,
mapping = mapping,
stat = StatSummarise,
geom = geom,
position = position,
show.legend = show.legend,
inherit.aes = inherit.aes,
params = list2(
na.rm = na.rm,
fun = fun,
fun.args = fun.args,
...
)
)
}

#' @rdname ggplot2-ggproto
#' @format NULL
#' @usage NULL
#' @export
StatSummarise <- ggproto(
"StatSummarise", Stat,

setup_params = function(data, params) {
params$fun <- allow_lambda(params$fun)
check_function(params$fun, arg = "fun")
if (!is_named2(params$fun.args)) {
cli::cli_abort("Every element in {.arg fun.args} must be named.")
}
if (identical(params$fun, express_group) && length(params$fun.args) > 0) {
check_object(
params$fun.args, is_quosures, arg = "fun.args",
"generated by `vars()`", allow_null = TRUE
)
}
params
},

compute_group = function(data, scales, fun = express_group, fun.args = list()) {
inject(fun(data, !!!fun.args))
}
)

express_group <- function(data, ...) {
exprs <- list2(...)
if (length(exprs) < 1) {
return(data)

Check warning on line 119 in R/stat-summarise.R

View check run for this annotation

Codecov / codecov/patch

R/stat-summarise.R#L117-L119

Added lines #L117 - L119 were not covered by tests
}
data <- unclass(data)

Check warning on line 121 in R/stat-summarise.R

View check run for this annotation

Codecov / codecov/patch

R/stat-summarise.R#L121

Added line #L121 was not covered by tests
# We append each evaluated expression to `data`, so that the next expression
# can use the result of all previously evaluated expressions
nms <- names(exprs)
for (i in seq_along(exprs)) {
data[[nms[[i]]]] <- eval_tidy(exprs[[i]], data)

Check warning on line 126 in R/stat-summarise.R

View check run for this annotation

Codecov / codecov/patch

R/stat-summarise.R#L124-L126

Added lines #L124 - L126 were not covered by tests
}
data_frame0(!!!data[unique0(names(exprs))])

Check warning on line 128 in R/stat-summarise.R

View check run for this annotation

Codecov / codecov/patch

R/stat-summarise.R#L128

Added line #L128 was not covered by tests
}
5 changes: 3 additions & 2 deletions man/ggplot2-ggproto.Rd

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

171 changes: 171 additions & 0 deletions man/stat_summarise.Rd

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

Loading