Rename stat_bar to stat_count

Author: wch

NAMESPACE

@@ -176,13 +176,13 @@ export(ScaleDiscrete)
 export(ScaleDiscreteIdentity)
 export(ScaleDiscretePosition)
 export(Stat)
-export(StatBar)
 export(StatBin)
 export(StatBin2d)
 export(StatBindot)
 export(StatBinhex)
 export(StatBoxplot)
 export(StatContour)
+export(StatCount)
 export(StatDensity)
 export(StatDensity2d)
 export(StatEcdf)
@@ -415,14 +415,14 @@ export(scale_y_log10)
 export(scale_y_reverse)
 export(scale_y_sqrt)
 export(should_stop)
-export(stat_bar)
 export(stat_bin)
 export(stat_bin2d)
 export(stat_bin_2d)
 export(stat_bin_hex)
 export(stat_binhex)
 export(stat_boxplot)
 export(stat_contour)
+export(stat_count)
 export(stat_density)
 export(stat_density2d)
 export(stat_ecdf)

NEWS

@@ -93,7 +93,7 @@ ggplot2 1.0.1.9xxx
   default values once per layer, rather than once per panel (#1220).
 
 * `geom_bar()` and `geom_histogram()` no longer share `stat_bin()`. Now
-  `geom_bar()` has its own stat, `stat_bar()`. This is useful if you want to
+  `geom_bar()` has its own stat, `stat_coont()`. This is useful if you want to
   display a bar chart of continuous data, drawing a bar at each unique
   location.
 

R/geom-bar.r

@@ -1,10 +1,10 @@
 #' Bars, rectangles with bases on x-axis
 #'
 #' There are two types of bar charts, determined by what is mapped to bar
-#' height. By default, \code{geom_bar} uses \code{stat = "bar"} which makes the
-#' height of the bar proportion to the number of cases in each group (or
-#' if the \code{weight} aethetic is supplied, the sum of the weights).
-#  If you want the heights of the bars to represent values in the data, use
+#' height. By default, \code{geom_bar} uses \code{stat = "count"} which makes
+#' the height of the bar proportion to the number of cases in each group (or if
+#' the \code{weight} aethetic is supplied, the sum of the weights). If you want
+#' the heights of the bars to represent values in the data, use
 #' \code{stat="identity"} and map a variable to the \code{y} aesthetic.
 #'
 #' A bar chart maps the height of the bar to a variable, and so the base of
@@ -29,7 +29,7 @@
 #' @param width Bar width. By default, set of 90% of the resolution of the
 #'   data.
 #' @param geom,stat Override the default connection between \code{geom_bar} and
-#'   \code{stat_bar}.
+#'   \code{stat_count}.
 #' @examples
 #' # geom_bar is designed to make it easy to create bar charts that show
 #' # counts (or sums of weights)
@@ -70,7 +70,7 @@
 #' }
 #' ggplot(mpg, aes(reorder_size(class))) + geom_bar()
 #' }
-geom_bar <- function(mapping = NULL, data = NULL, stat = "bar",
+geom_bar <- function(mapping = NULL, data = NULL, stat = "count",
                      position = "stack", width = NULL, ...,
                      show.legend = NA, inherit.aes = TRUE) {
   layer(
@@ -118,13 +118,13 @@ GeomBar <- ggproto("GeomBar", GeomRect,
 #'   \item{count}{number of points in bin}
 #'   \item{prop}{groupwise proportion}
 #' }
-stat_bar <- function(mapping = NULL, data = NULL, geom = "bar",
+stat_count <- function(mapping = NULL, data = NULL, geom = "bar",
                      position = "stack", width = NULL, ...,
                      show.legend = NA, inherit.aes = TRUE) {
   layer(
     data = data,
     mapping = mapping,
-    stat = StatBar,
+    stat = StatCount,
     geom = geom,
     position = position,
     show.legend = show.legend,
@@ -141,13 +141,13 @@ stat_bar <- function(mapping = NULL, data = NULL, geom = "bar",
 #' @usage NULL
 #' @export
 #' @include stat-.r
-StatBar <- ggproto("StatBar", Stat,
+StatCount <- ggproto("StatCount", Stat,
   required_aes = "x",
   default_aes = aes(y = ..count..),
 
   setup_params = function(data, params) {
     if (!is.null(data$y) || !is.null(params$y)) {
-      stop("stat_bar() must not be used with a y aesthetic.", call. = FALSE)
+      stop("stat_count() must not be used with a y aesthetic.", call. = FALSE)
     }
     params
   },

man/geom_bar.Rd

@@ -2,14 +2,16 @@
 % Please edit documentation in R/geom-bar.r
 \name{geom_bar}
 \alias{geom_bar}
-\alias{stat_bar}
+\alias{stat_count}
 \title{Bars, rectangles with bases on x-axis}
 \usage{
-geom_bar(mapping = NULL, data = NULL, stat = "bar", position = "stack",
-  width = NULL, ..., show.legend = NA, inherit.aes = TRUE)
+geom_bar(mapping = NULL, data = NULL, stat = "count",
+  position = "stack", width = NULL, ..., show.legend = NA,
+  inherit.aes = TRUE)
 
-stat_bar(mapping = NULL, data = NULL, geom = "bar", position = "stack",
-  width = NULL, ..., show.legend = NA, inherit.aes = TRUE)
+stat_count(mapping = NULL, data = NULL, geom = "bar",
+  position = "stack", width = NULL, ..., show.legend = NA,
+  inherit.aes = TRUE)
 }
 \arguments{
 \item{mapping}{Set of aesthetic mappings created by \code{\link{aes}} or
@@ -48,13 +50,14 @@ that define both data and aesthetics and shouldn't inherit behaviour from
 the default plot specification, e.g. \code{\link{borders}}.}
 
 \item{geom,stat}{Override the default connection between \code{geom_bar} and
-\code{stat_bar}.}
+\code{stat_count}.}
 }
 \description{
 There are two types of bar charts, determined by what is mapped to bar
-height. By default, \code{geom_bar} uses \code{stat = "bar"} which makes the
-height of the bar proportion to the number of cases in each group (or
-if the \code{weight} aethetic is supplied, the sum of the weights).
+height. By default, \code{geom_bar} uses \code{stat = "count"} which makes
+the height of the bar proportion to the number of cases in each group (or if
+the \code{weight} aethetic is supplied, the sum of the weights). If you want
+the heights of the bars to represent values in the data, use
 \code{stat="identity"} and map a variable to the \code{y} aesthetic.
 }
 \details{

man/ggplot2-ggproto.Rd

@@ -69,13 +69,13 @@
 \alias{ScaleDiscreteIdentity}
 \alias{ScaleDiscretePosition}
 \alias{Stat}
-\alias{StatBar}
 \alias{StatBin}
 \alias{StatBin2d}
 \alias{StatBindot}
 \alias{StatBinhex}
 \alias{StatBoxplot}
 \alias{StatContour}
+\alias{StatCount}
 \alias{StatDensity}
 \alias{StatDensity2d}
 \alias{StatEcdf}

tests/testthat/test-stat-bin.R

@@ -1,4 +1,4 @@
-context("stat_bar/stat_bin")
+context("stat_bin/stat_count")
 
 test_that("stat_bin throws error when y aesthetic present", {
   dat <- data.frame(x = c("a", "b", "c"), y = c(1, 5, 10))
@@ -10,17 +10,17 @@ test_that("stat_bin throws error when y aesthetic present", {
     "Unknown parameters: y")
 })
 
-test_that("stat_bar throws error when y aesthetic present", {
+test_that("stat_count throws error when y aesthetic present", {
   dat <- data.frame(x = c("a", "b", "c"), y = c(1, 5, 10))
 
-  expect_error(ggplot_build(ggplot(dat, aes(x, y)) + stat_bar()),
+  expect_error(ggplot_build(ggplot(dat, aes(x, y)) + stat_count()),
     "must not be used with a y aesthetic.")
 
-  expect_error(p <- ggplot_build(ggplot(dat, aes(x)) + stat_bar(y = 5)),
+  expect_error(p <- ggplot_build(ggplot(dat, aes(x)) + stat_count(y = 5)),
     "Unknown parameters: y")
 })
 
-test_that("stat_bar preserves x order for continuous and discrete", {
+test_that("stat_count preserves x order for continuous and discrete", {
   # x is numeric
   b <- ggplot_build(ggplot(mtcars, aes(carb)) + geom_bar())
   expect_identical(b$data[[1]]$x, c(1,2,3,4,6,8))