Removes usage of stat_bin2d() and similar (#5451)

* Removes usage of stat_bin2d

* Removes usage of stat_binhex()

* Removes geom_bin2d()

* Changes name in rd_aesthetics

Author: eliocamp

R/coord-cartesian-.R

@@ -49,7 +49,7 @@
 #'
 #' # You can see the same thing with this 2d histogram
 #' d <- ggplot(diamonds, aes(carat, price)) +
-#'   stat_bin2d(bins = 25, colour = "white")
+#'   stat_bin_2d(bins = 25, colour = "white")
 #' d
 #'
 #' # When zooming the scale, the we get 25 new bins that are the same

R/geom-bin2d.R

@@ -5,14 +5,14 @@
 #' rectangle's fill. This is a useful alternative to [geom_point()]
 #' in the presence of overplotting.
 #'
-#' @eval rd_aesthetics("stat", "bin2d")
+#' @eval rd_aesthetics("stat", "bin_2d")
 #'
 #' @export
 #' @inheritParams layer
 #' @inheritParams geom_point
 #' @param geom,stat Use to override the default connection between
 #'   `geom_bin_2d()` and `stat_bin_2d()`.
-#' @seealso [stat_binhex()] for hexagonal binning
+#' @seealso [stat_bin_hex()] for hexagonal binning
 #' @examples
 #' d <- ggplot(diamonds, aes(x, y)) + xlim(4, 10) + ylim(4, 10)
 #' d + geom_bin_2d()

R/geom-count.R

@@ -7,7 +7,7 @@
 #' @eval rd_aesthetics("geom", "point")
 #' @param geom,stat Use to override the default connection between
 #'   `geom_count()` and `stat_sum()`.
-#' @seealso For continuous `x` and `y`, use [geom_bin2d()].
+#' @seealso For continuous `x` and `y`, use [geom_bin_2d()].
 #' @inheritParams layer
 #' @inheritParams geom_point
 #' @export

R/geom-density2d.R

@@ -9,7 +9,7 @@
 #' @eval rd_aesthetics("geom", "density_2d")
 #' @eval rd_aesthetics("geom", "density_2d_filled")
 #' @seealso [geom_contour()], [geom_contour_filled()] for information about
-#'  how contours are drawn; [geom_bin2d()] for another way of dealing with
+#'  how contours are drawn; [geom_bin_2d()] for another way of dealing with
 #'  overplotting.
 #' @param geom,stat Use to override the default connection between
 #'   `geom_density_2d()` and `stat_density_2d()`.

R/geom-hex.R

@@ -3,12 +3,12 @@
 #' Divides the plane into regular hexagons, counts the number of cases in
 #' each hexagon, and then (by default) maps the number of cases to the hexagon
 #' fill.  Hexagon bins avoid the visual artefacts sometimes generated by
-#' the very regular alignment of [geom_bin2d()].
+#' the very regular alignment of [geom_bin_2d()].
 #'
 #' @eval rd_aesthetics("geom", "hex")
-#' @seealso [stat_bin2d()] for rectangular binning
+#' @seealso [stat_bin_2d()] for rectangular binning
 #' @param geom,stat Override the default connection between `geom_hex()` and
-#'   `stat_binhex()`.
+#'   `stat_bin_hex()`.
 #' @export
 #' @inheritParams layer
 #' @inheritParams geom_point

R/geom-point.R

@@ -4,7 +4,7 @@
 #' useful for displaying the relationship between two continuous variables.
 #' It can be used to compare one continuous and one categorical variable, or
 #' two categorical variables, but a variation like [geom_jitter()],
-#' [geom_count()], or [geom_bin2d()] is usually more
+#' [geom_count()], or [geom_bin_2d()] is usually more
 #' appropriate. A _bubblechart_ is a scatterplot with a third variable
 #' mapped to the size of points.
 #'

R/geom-tile.R

@@ -60,8 +60,8 @@
 #' # Inspired by the image-density plots of Ken Knoblauch
 #' cars <- ggplot(mtcars, aes(mpg, factor(cyl)))
 #' cars + geom_point()
-#' cars + stat_bin2d(aes(fill = after_stat(count)), binwidth = c(3,1))
-#' cars + stat_bin2d(aes(fill = after_stat(density)), binwidth = c(3,1))
+#' cars + stat_bin_2d(aes(fill = after_stat(count)), binwidth = c(3,1))
+#' cars + stat_bin_2d(aes(fill = after_stat(density)), binwidth = c(3,1))
 #'
 #' cars +
 #'   stat_density(

R/stat-binhex.R

@@ -48,7 +48,7 @@ StatBinhex <- ggproto("StatBinhex", Stat,
 
   compute_group = function(data, scales, binwidth = NULL, bins = 30,
                            na.rm = FALSE) {
-    check_installed("hexbin", reason = "for `stat_binhex()`")
+    check_installed("hexbin", reason = "for `stat_bin_hex()`")
 
     binwidth <- binwidth %||% hex_binwidth(bins, scales)
     wt <- data$weight %||% rep(1L, nrow(data))

R/stat-summary-2d.R

@@ -21,7 +21,7 @@
 #'   \item{`z`}{After binning, the z values of individual data points are no longer available.}
 #' }
 #' @seealso [stat_summary_hex()] for hexagonal summarization.
-#'   [stat_bin2d()] for the binning options.
+#'   [stat_bin_2d()] for the binning options.
 #' @inheritParams layer
 #' @inheritParams geom_point
 #' @inheritParams stat_bin_2d

man/coord_cartesian.Rd

@@ -1,7 +1,7 @@
 test_that("binwidth is respected", {
   df <- data_frame(x = c(1, 1, 1, 2), y = c(1, 1, 1, 2))
   base <- ggplot(df, aes(x, y)) +
-    stat_bin2d(geom = "tile", binwidth = 0.25)
+    stat_bin_2d(geom = "tile", binwidth = 0.25)
 
   out <- layer_data(base)
   expect_equal(nrow(out), 2)
@@ -10,11 +10,11 @@ test_that("binwidth is respected", {
   expect_equal(out$xmax, c(1.25, 2), tolerance = 1e-7)
 
   p <- ggplot(df, aes(x, y)) +
-    stat_bin2d(geom = "tile", binwidth = c(0.25, 0.5, 0.75))
+    stat_bin_2d(geom = "tile", binwidth = c(0.25, 0.5, 0.75))
   expect_snapshot_warning(ggplot_build(p))
 
   p <- ggplot(df, aes(x, y)) +
-    stat_bin2d(geom = "tile", origin = c(0.25, 0.5, 0.75))
+    stat_bin_2d(geom = "tile", origin = c(0.25, 0.5, 0.75))
   expect_snapshot_warning(ggplot_build(p))
 })
 
@@ -26,7 +26,7 @@ test_that("breaks override binwidth", {
 
   df <- data_frame(x = 0:3, y = 0:3)
   base <- ggplot(df, aes(x, y)) +
-    stat_bin2d(
+    stat_bin_2d(
       breaks = list(x = integer_breaks, y = NULL),
       binwidth = c(0.5, 0.5)
     )