Skip to content

Commit

Permalink
stat_count() respects uniqueness of x (#5520)
Browse files Browse the repository at this point in the history
* instead of removing, `position_stack()` sets incomplete data to missing

* adjust test

* add test

* Add news bullet
  • Loading branch information
teunbrand authored Dec 14, 2023
1 parent aa41dcb commit abc70e2
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
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)

* `stat_count()` treats `x` as unique in the same manner `unique()` does
(#4609).

* `position_stack()` no longer silently removes missing data, which is now
handled by the geom instead of position (#3532).

Expand Down
3 changes: 1 addition & 2 deletions R/stat-count.R
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ StatCount <- ggproto("StatCount", Stat,
x <- data$x
weight <- data$weight %||% rep(1, length(x))

count <- as.numeric(tapply(weight, x, sum, na.rm = TRUE))
count[is.na(count)] <- 0
count <- as.vector(rowsum(weight, x, na.rm = TRUE))

bars <- data_frame0(
count = count,
Expand Down
11 changes: 11 additions & 0 deletions tests/testthat/test-stat-count.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,14 @@ test_that("stat_count() checks the aesthetics", {
p <- ggplot(mtcars) + stat_count(aes(factor(gear), mpg))
expect_snapshot_error(ggplot_build(p))
})

test_that("stat_count() respects uniqueness of `x`", {
# For #4609, converting x to factor loses smallest digits, so here we test
# if they are retained
df <- data_frame0(x = c(1, 2, 1, 2) + rep(c(0, 1.01 * .Machine$double.eps), each = 2))
p <- ggplot(df, aes(x)) + stat_count(position = "identity")
data <- layer_data(p)

expect_length(vec_unique(df$x), 4)
expect_equal(data$y, rep(1, 4))
})

0 comments on commit abc70e2

Please sign in to comment.