Skip to content

Allow rlang-style lambda expressions in stat_summary functions #3569

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Dec 18, 2019
Merged

Allow rlang-style lambda expressions in stat_summary functions #3569

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
436f3c5
Closes #3568
dkahle Oct 14, 2019
3142adb
remove rlang:: references, simplify fun.data logic
dkahle Dec 15, 2019
86501a3
remove predicate condition for using as_function() in stat_summary_*(…
dkahle Dec 16, 2019
213e0d9
insert comment in updated news file
dkahle Dec 16, 2019
af34495
fix merge conflicts
dkahle Dec 16, 2019
47e5159
resolve merge conflicts
dkahle Dec 17, 2019
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
2 changes: 1 addition & 1 deletion R/stat-summary-2d.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ StatSummary2d <- ggproto("StatSummary2d", Stat,
xbin <- cut(data$x, xbreaks, include.lowest = TRUE, labels = FALSE)
ybin <- cut(data$y, ybreaks, include.lowest = TRUE, labels = FALSE)

if (is.formula(fun)) fun <- rlang::as_function(fun)
if (is.formula(fun)) fun <- as_function(fun)
Copy link
Member

Choose a reason for hiding this comment

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

I think you can just remove the is.formula check and call as_function() unconditionally... same with the other two places

f <- function(x) {
do.call(fun, c(list(quote(x)), fun.args))
}
Expand Down
8 changes: 2 additions & 6 deletions R/stat-summary-bin.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,7 @@ make_summary_fun <- function(fun.data, fun, fun.max, fun.min, fun.args) {

if (!is.null(fun.data)) {
# Function that takes complete data frame as input
if (is.formula(fun.data)) {
fun.data <- rlang::as_function(fun.data)
} else {
fun.data <- match.fun(fun.data)
}
fun.data <- as_function(fun.data)
function(df) {
do.call(fun.data, c(list(quote(df$y)), fun.args))
}
Expand All @@ -109,7 +105,7 @@ make_summary_fun <- function(fun.data, fun, fun.max, fun.min, fun.args) {

call_f <- function(fun, x) {
if (is.null(fun)) return(NA_real_)
if (is.formula(fun)) fun <- rlang::as_function(fun)
if (is.formula(fun)) fun <- as_function(fun)
do.call(fun, c(list(quote(x)), fun.args))
}

Expand Down
2 changes: 1 addition & 1 deletion R/stat-summary-hex.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ StatSummaryHex <- ggproto("StatSummaryHex", Stat,
try_require("hexbin", "stat_summary_hex")

binwidth <- binwidth %||% hex_binwidth(bins, scales)
if (is.formula(fun)) fun <- rlang::as_function(fun)
if (is.formula(fun)) fun <- as_function(fun)
hexBinSummarise(data$x, data$y, data$z, binwidth,
fun = fun, fun.args = fun.args, drop = drop)
}
Expand Down