Skip to content

Move seed setup in position_jitter() to setup_params() from the constructor #4413

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
thomasp85 merged 1 commit into from
Apr 13, 2021
Merged

Move seed setup in position_jitter() to setup_params() from the constructor #4413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# ggplot2 (development version)

* Make sure position_jitter creates the same jittering independent of whether it
is called by name or with constructor (@thomasp85, #2507)

* Fix a bug in `position_dodge2()` where `NA` values in thee data would cause an
error (@thomasp85, #2905)

Expand Down
12 changes: 7 additions & 5 deletions R/position-jitter.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@
#' geom_point(position = jitter) +
#' geom_point(position = jitter, color = "red", aes(am + 0.2, vs + 0.2))
position_jitter <- function(width = NULL, height = NULL, seed = NA) {
if (!is.null(seed) && is.na(seed)) {
seed <- sample.int(.Machine$integer.max, 1L)
}

ggproto(NULL, PositionJitter,
width = width,
height = height,
Expand All @@ -62,13 +58,19 @@ position_jitter <- function(width = NULL, height = NULL, seed = NA) {
#' @usage NULL
#' @export
PositionJitter <- ggproto("PositionJitter", Position,
seed = NA,
required_aes = c("x", "y"),

setup_params = function(self, data) {
if (!is.null(self$seed) && is.na(self$seed)) {
seed <- sample.int(.Machine$integer.max, 1L)
} else {
seed <- self$seed
}
list(
width = self$width %||% (resolution(data$x, zero = FALSE) * 0.4),
height = self$height %||% (resolution(data$y, zero = FALSE) * 0.4),
seed = self$seed
seed = seed
)
},

Expand Down