Grouping tidy up.

Removed order_groups because while it changes the order of the rows, it doesn't affect the order in which the groups are plotted. (Plus it was never well documented)

Author: hadley

DESCRIPTION

@@ -128,6 +128,7 @@ Collate:
     'grob-absolute.r'
     'grob-dotstack.r'
     'grob-null.r'
+    'grouping.r'
     'guide-colorbar.r'
     'guide-legend.r'
     'guides-.r'
@@ -205,7 +206,6 @@ Collate:
     'utilities-break.r'
     'utilities-grid.r'
     'utilities-help.r'
-    'utilities-layer.r'
     'utilities-matrix.r'
     'utilities-resolution.r'
     'utilities-table.r'

NEWS

@@ -1,6 +1,9 @@
 ggplot2 1.0.1.9xxx
 ----------------------------------------------------------------
 
+* `order` aesthetic is officially no longer supported. It never really worked,
+  and was poorly documented.
+
 * When setting limits with `coord_cartesian()`, it now applies the same
   expansion factor as setting limits with scales. You can suppress with
   `expand = FALSE` (#1207).

R/aes-group-order.r

@@ -1,7 +1,7 @@
-#' Aesthetics: group, order
+#' Aesthetics: group
 #'
 #' @name aes_group_order
-#' @aliases group order
+#' @aliases group
 #'
 #' @examples
 #' \donttest{
@@ -76,15 +76,5 @@
 #' # we again need to override the default grouping for that layer with aes(group = Subject)
 #' boysbox <- boysbox + geom_boxplot()
 #' boysbox + geom_line(aes(group = Subject), colour = "blue")
-#'
-#' # Use the order aesthetic to change stacking order of bar charts
-#' w <- ggplot(diamonds, aes(clarity, fill = cut))
-#' w + geom_bar()
-#' w + geom_bar(aes(order = desc(cut)))
-#'
-#' # Can also be used to change plot order of scatter plots
-#' d <- ggplot(diamonds, aes(carat, price, colour = cut))
-#' d + geom_point()
-#' d + geom_point(aes(order = sample(seq_along(carat))))
 #' }
 NULL

R/aes.r

@@ -7,7 +7,7 @@ NULL
 # all <- sort(unique(c(names(.base_to_ggplot), geom_aes, stat_aes)))
 # dput(all)
 
-.all_aesthetics <- c("adj", "alpha", "angle", "bg", "cex", "col", "color", "colour", "fg", "fill", "group", "hjust", "label", "linetype", "lower", "lty", "lwd", "max", "middle", "min", "order", "pch", "radius", "sample", "shape", "size", "srt", "upper", "vjust", "weight", "width", "x", "xend", "xmax", "xmin", "xintercept", "y", "yend", "ymax", "ymin", "yintercept", "z")
+.all_aesthetics <- c("adj", "alpha", "angle", "bg", "cex", "col", "color", "colour", "fg", "fill", "group", "hjust", "label", "linetype", "lower", "lty", "lwd", "max", "middle", "min", "pch", "radius", "sample", "shape", "size", "srt", "upper", "vjust", "weight", "width", "x", "xend", "xmax", "xmin", "xintercept", "y", "yend", "ymax", "ymin", "yintercept", "z")
 
 .base_to_ggplot <- c(
   "col"   = "colour",

R/utilities-layer.r renamed to R/grouping.r

@@ -8,11 +8,6 @@ NO_GROUP <- -1L
 # variable is generated from the interaction of all discrete (factor or
 # character) vectors, excluding \code{label}. The special value \code{NO_GROUP}
 # is used for all observations if no discrete variables exist.
-#
-# @param data.frame
-# @value data.frame with group variable
-# @keyword internal
-# @seealso has_groups
 add_group <- function(data) {
   if (empty(data)) return(data)
 
@@ -32,12 +27,6 @@ add_group <- function(data) {
   data
 }
 
-order_groups <- function(data) {
-  if (is.null(data$order)) return(data)
-
-  data[order(data$order), ]
-}
-
 # Is a grouping available?
 # (Will return TRUE if an explicit group or a discrete variable with only one
 # level existed when add_group() was called.)

R/layer.r

@@ -132,12 +132,15 @@ Layer <- ggproto("Layer", NULL,
     }
     check_aesthetics(evaled, n)
 
+    # Set special group and panel vars
     if (empty(data) && n > 0) {
       evaled$PANEL <- 1
     } else {
       evaled$PANEL <- data$PANEL
     }
-    data.frame(evaled)
+    evaled <- data.frame(evaled)
+    evaled <- add_group(evaled)
+    evaled
   },
 
   compute_statistic = function(self, data, panel) {

R/plot-build.r

@@ -40,7 +40,6 @@ ggplot_build <- function(plot) {
 
   # Compute aesthetics to produce data with generalised variable names
   data <- by_layer(function(l, d) l$compute_aesthetics(d, plot))
-  data <- lapply(data, add_group)
 
   # Transform all scales
   data <- lapply(data, scales_transform_df, scales = scales)
@@ -56,7 +55,6 @@ ggplot_build <- function(plot) {
   # Apply and map statistics
   data <- by_layer(function(l, d) l$compute_statistic(d, panel))
   data <- by_layer(function(l, d) l$map_statistic(d, plot))
-  data <- lapply(data, order_groups)
 
   # Make sure missing (but required) aesthetics are added
   scales_add_missing(plot, c("x", "y"), plot$plot_env)

man/aes_group_order.Rd

@@ -3,10 +3,9 @@
 \name{aes_group_order}
 \alias{aes_group_order}
 \alias{group}
-\alias{order}
-\title{Aesthetics: group, order}
+\title{Aesthetics: group}
 \description{
-Aesthetics: group, order
+Aesthetics: group
 }
 \examples{
 \donttest{
@@ -81,16 +80,6 @@ boysbox + geom_boxplot()
 # we again need to override the default grouping for that layer with aes(group = Subject)
 boysbox <- boysbox + geom_boxplot()
 boysbox + geom_line(aes(group = Subject), colour = "blue")
-
-# Use the order aesthetic to change stacking order of bar charts
-w <- ggplot(diamonds, aes(clarity, fill = cut))
-w + geom_bar()
-w + geom_bar(aes(order = desc(cut)))
-
-# Can also be used to change plot order of scatter plots
-d <- ggplot(diamonds, aes(carat, price, colour = cut))
-d + geom_point()
-d + geom_point(aes(order = sample(seq_along(carat))))
 }
 }
 

tests/testthat/test-aes-grouping.r

@@ -42,29 +42,3 @@ test_that("group param overrides defaults", {
   plot <- ggplot(df, aes(a, b)) + geom_point(group = 1)
   expect_equal(groups(plot), 1)
 })
-
-test_that("order affects plotting order of points", {
-  base <- ggplot(df, aes(a, x)) + geom_point()
-
-  ord1 <- layer_data(base)
-  ord2 <- layer_data(base + aes(order = x))
-  rev1 <- layer_data(base + aes(order = -x))
-  rev2 <- layer_data(base + aes(order = plyr::desc(x)))
-
-  expect_equal(ord1$y, 1:4)
-  expect_equal(ord2$y, 1:4)
-  expect_equal(rev1$y, 4:1)
-  expect_equal(rev2$y, 4:1)
-})
-
-test_that("order affects plotting order of bars", {
-  base <- ggplot(df, aes(a, fill = b)) + geom_bar()
-
-  ord1 <- layer_data(base)
-  ord2 <- layer_data(base + aes(order = a))
-  rev1 <- layer_data(base + aes(order = plyr::desc(b)))
-
-  expect_equal(ord1$group, 1:4)
-  expect_equal(ord2$group, 1:4)
-  expect_equal(rev1$group, c(2, 1, 4, 3))
-})