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

stat_smooth() drops failed groups #5371

Merged
merged 7 commits into from
Oct 2, 2023
Merged
Show file tree
Hide file tree
Changes from 6 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
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# ggplot2 (development version)

* Failing to fit or predict in `stat_smooth()` now gives a warning and omits
the failed group, instead of throwing an error (@teunbrand, #5352).

* Integers are once again valid input to theme arguments that expect numeric
input (@teunbrand, #5369)

Expand Down
27 changes: 19 additions & 8 deletions R/stat-smooth.R
Original file line number Diff line number Diff line change
Expand Up @@ -171,14 +171,25 @@ StatSmooth <- ggproto("StatSmooth", Stat,
method.args$method <- "REML"
}

model <- inject(method(
formula,
data = data,
weights = weight,
!!!method.args
))

prediction <- predictdf(model, xseq, se, level)
prediction <- try_fetch(
{
model <- inject(method(
formula,
data = data,
weights = weight,
!!!method.args
))
predictdf(model, xseq, se, level)
},
error = function(cnd) {
cli::cli_warn("Failed to fit group {data$group[1]}.", parent = cnd)
NULL
}
)
if (is.null(prediction)) {
return(NULL)
}

prediction$flipped_aes <- flipped_aes
flip_data(prediction, flipped_aes)
},
Expand Down
16 changes: 16 additions & 0 deletions tests/testthat/test-geom-smooth.R
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,22 @@ test_that("default smoothing methods for small and large data sets work", {
expect_equal(plot_data$y, as.numeric(out))
})

test_that("geom_smooth() works when one group fails", {
# Group A fails, B succeeds
df <- data_frame0(
x = c(1, 2, 1, 2, 3),
y = c(1, 2, 3, 2, 1),
g = rep(c("A", "B"), 2:3)
)
p <- ggplot(df, aes(x, y, group = g)) +
geom_smooth(method = "loess", formula = y ~ x)

suppressWarnings(
expect_warning(ld <- layer_data(p), "Failed to fit group 1")
)
expect_equal(unique(ld$group), 2)
expect_gte(nrow(ld), 2)
})

# Visual tests ------------------------------------------------------------

Expand Down
8 changes: 2 additions & 6 deletions tests/testthat/test-stats.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,9 @@ test_that("plot succeeds even if some computation fails", {
b1 <- ggplot_build(p1)
expect_equal(length(b1$data), 1)

p2 <- p1 + geom_smooth()
p2 <- p1 + stat_summary(fun = function(x) stop("Failed computation"))

# TODO: These multiple warnings should be summarized nicely. Until this gets
# fixed, this test ignores all the following errors than the first one.
suppressWarnings(
expect_warning(b2 <- ggplot_build(p2), "Computation failed")
)
expect_warning(b2 <- ggplot_build(p2), "Computation failed")
expect_equal(length(b2$data), 2)
})

Expand Down
Loading