Fixes for examples

Author: hadley

R/annotation-custom.r

@@ -24,14 +24,13 @@ NULL
 #' # Dummy plot
 #' base <- qplot(1:10, 1:10, geom = "blank") + theme_bw()
 #' # Adding a table
-#' \donttest{
-#' require(gridExtra)
+#' \donttest{if (require(gridExtra)) {
 #' base + annotation_custom(grob = tableGrob(head(iris[ ,1:3])),
 #'         xmin = 3, xmax = 6, ymin = 2, ymax = 8)
 #' # full panel
 #' base + annotation_custom(grob = roundrectGrob(),
 #'           xmin = -Inf, xmax = Inf, ymin = -Inf, ymax = Inf)
-#' }
+#' }}
 #' # Inset plot
 #' g <- ggplotGrob(qplot(1, 1) +
 #'   theme(plot.background = element_rect(colour = "black")))

R/facet-labels.r

@@ -103,26 +103,18 @@ label_wrap_gen <- function(width = 25) {
 #'   \code{\link{facet_grid}} for the argument \code{labeller}.
 #' @export
 #' @examples
-#'
-#' data(mpg)
-#'
+#' \donttest{
 #' p1 <- ggplot(mpg, aes(cty, hwy)) + geom_point()
-#'
-#'
 #' p1 + facet_grid(cyl ~ class, labeller=label_both)
-#'
 #' p1 + facet_grid(cyl ~ class, labeller=labeller(cyl=label_both))
 #'
 #' ggplot(mtcars, aes(x = mpg, y = wt)) + geom_point() +
 #'   facet_grid(vs + am ~ gear, margins=TRUE,
 #'              labeller=labeller(vs=label_both, am=label_both))
 #'
-#'
-#'
-#' data(msleep)
 #' capitalize <- function(string) {
 #'   substr(string, 1, 1) <- toupper(substr(string, 1, 1))
-#'  string
+#'   string
 #' }
 #' conservation_status <- c('cd'='Conservation Dependent',
 #'                          'en'='Endangered',
@@ -132,22 +124,22 @@ label_wrap_gen <- function(width = 25) {
 #'                          'domesticated'='Domesticated')
 #' ## Source: http://en.wikipedia.org/wiki/Uncyclopedia:Conservation_status
 #'
-#' p2 <- ggplot(msleep, aes(x=sleep_total, y=awake)) + geom_point() +
-#' p2 + facet_grid(vore ~ conservation, labeller=labeller(vore=capitalize))
+#' p2 <- ggplot(msleep, aes(x=sleep_total, y=awake)) + geom_point()
+#' p2 + facet_grid(vore ~ conservation, labeller = labeller(vore = capitalize))
 #'
 #' p2 + facet_grid(vore ~ conservation,
-#'   labeller=labeller(vore=capitalize, conservation=conservation_status ))
+#'   labeller=labeller(vore = capitalize, conservation = conservation_status ))
 #'
 #' # We could of course have renamed the levels;
 #' # then we can apply another nifty function:
-#' library(plyr)
-#' msleep$conservation2 <- revalue(msleep$conservation, conservation_status)
-#'
-#' p2 + facet_grid(vore ~ conservation2, labeller=labeller(vore=capitalize))
-#'
-#' p2 + facet_grid(vore ~ conservation2,
-#'   labeller=labeller(conservation2=label_wrap_gen(10) ))
+#' msleep$conservation2 <- plyr::revalue(msleep$conservation, conservation_status)
 #'
+#' p2 %+% msleep +
+#'   facet_grid(vore ~ conservation2, labeller = labeller(vore = capitalize))
+#' p2 %+% msleep +
+#'  facet_grid(vore ~ conservation2, labeller = labeller(conservation2 =
+#'  label_wrap_gen(10)))
+#' }
 labeller <- function(..., keep.as.numeric=FALSE) {
   args <- list(...)
 

R/geom-dotplot.r

@@ -60,7 +60,7 @@
 #'
 #' # y axis isn't really meaningful, so hide it
 #' ggplot(mtcars, aes(x = mpg)) + geom_dotplot(binwidth = 1.5) +
-#'   scale_y_continuous(name = "", breaks = NA)
+#'   scale_y_continuous(name = "", breaks = NULL)
 #'
 #' # Overlap dots vertically
 #' ggplot(mtcars, aes(x = mpg)) + geom_dotplot(binwidth = 1.5, stackratio = .7)
@@ -95,7 +95,7 @@
 #'
 #' ggplot(mtcars, aes(x = 1, y = mpg, fill = factor(cyl))) +
 #'   geom_dotplot(binaxis = "y", stackgroups = TRUE, binwidth = 1, method = "histodot")
-#'   
+#'
 #' # Use qplot instead
 #' qplot(mpg, data = mtcars, geom = "dotplot")
 #'

R/scale-gradient2.r

@@ -45,7 +45,8 @@
 #' d + scale_colour_gradient2(midpoint=mean(diamonds$price / diamonds$carat))
 #'
 #' # Fill gradients work much the same way
-#' p <- qplot(letters[1:5], 1:5, fill= c(-3, 3, 5, 2, -2), geom="bar")
+#' p <- qplot(letters[1:5], 1:5, fill= c(-3, 3, 5, 2, -2), geom = "bar",
+#'   stat = "identity")
 #' p + scale_fill_gradient2("fill")
 #' # Note how positive and negative values of the same magnitude
 #' # have similar intensity

R/scale-size.r

@@ -16,7 +16,7 @@
 #' # Map area, instead of width/radius
 #' # Perceptually, this is a little better
 #' p + scale_size_area()
-#' p + scale_size_area(range = c(1, 25))
+#' p + scale_size_area(max_size = 25)
 #'
 #' # Also works with factors, but not a terribly good
 #' # idea, unless your factor is ordered, as in this example

R/stat-sum.r

@@ -24,7 +24,7 @@
 #' # by overall proportion
 #' d + stat_sum(aes(group = 1))
 #' d + stat_sum(aes(group = 1)) + scale_size(range = c(3, 10))
-#' d + stat_sum(aes(group = 1)) + scale_size_area(range = c(3, 10))
+#' d + stat_sum(aes(group = 1)) + scale_size_area(max_size = 10)
 #'
 #' # by cut
 #' d + stat_sum(aes(group = cut))

man/annotation_custom.Rd

@@ -34,14 +34,13 @@ Inf values can be used to fill the full plot panel (see examples).
 # Dummy plot
 base <- qplot(1:10, 1:10, geom = "blank") + theme_bw()
 # Adding a table
-\donttest{
-require(gridExtra)
+\donttest{if (require(gridExtra)) {
 base + annotation_custom(grob = tableGrob(head(iris[ ,1:3])),
         xmin = 3, xmax = 6, ymin = 2, ymax = 8)
 # full panel
 base + annotation_custom(grob = roundrectGrob(),
           xmin = -Inf, xmax = Inf, ymin = -Inf, ymax = Inf)
-}
+}}
 # Inset plot
 g <- ggplotGrob(qplot(1, 1) +
   theme(plot.background = element_rect(colour = "black")))

man/geom_dotplot.Rd

@@ -93,7 +93,7 @@ ggplot(mtcars, aes(x = mpg)) +
 
 # y axis isn't really meaningful, so hide it
 ggplot(mtcars, aes(x = mpg)) + geom_dotplot(binwidth = 1.5) +
-  scale_y_continuous(name = "", breaks = NA)
+  scale_y_continuous(name = "", breaks = NULL)
 
 # Overlap dots vertically
 ggplot(mtcars, aes(x = mpg)) + geom_dotplot(binwidth = 1.5, stackratio = .7)

man/labeller.Rd

@@ -33,25 +33,18 @@ or ``unused argument (variable)'', matching the method's arguments does not
 work as expected; make a wrapper function.
 }
 \examples{
-data(mpg)
-
+\donttest{
 p1 <- ggplot(mpg, aes(cty, hwy)) + geom_point()
-
-
 p1 + facet_grid(cyl ~ class, labeller=label_both)
-
 p1 + facet_grid(cyl ~ class, labeller=labeller(cyl=label_both))
 
 ggplot(mtcars, aes(x = mpg, y = wt)) + geom_point() +
   facet_grid(vs + am ~ gear, margins=TRUE,
              labeller=labeller(vs=label_both, am=label_both))
 
-
-
-data(msleep)
 capitalize <- function(string) {
   substr(string, 1, 1) <- toupper(substr(string, 1, 1))
- string
+  string
 }
 conservation_status <- c('cd'='Conservation Dependent',
                          'en'='Endangered',
@@ -61,20 +54,21 @@ conservation_status <- c('cd'='Conservation Dependent',
                          'domesticated'='Domesticated')
 ## Source: http://en.wikipedia.org/wiki/Uncyclopedia:Conservation_status
 
-p2 <- ggplot(msleep, aes(x=sleep_total, y=awake)) + geom_point() +
-p2 + facet_grid(vore ~ conservation, labeller=labeller(vore=capitalize))
+p2 <- ggplot(msleep, aes(x=sleep_total, y=awake)) + geom_point()
+p2 + facet_grid(vore ~ conservation, labeller = labeller(vore = capitalize))
 
 p2 + facet_grid(vore ~ conservation,
-  labeller=labeller(vore=capitalize, conservation=conservation_status ))
+  labeller=labeller(vore = capitalize, conservation = conservation_status ))
 
 # We could of course have renamed the levels;
 # then we can apply another nifty function:
-library(plyr)
-msleep$conservation2 <- revalue(msleep$conservation, conservation_status)
+msleep$conservation2 <- plyr::revalue(msleep$conservation, conservation_status)
 
-p2 + facet_grid(vore ~ conservation2, labeller=labeller(vore=capitalize))
-
-p2 + facet_grid(vore ~ conservation2,
-  labeller=labeller(conservation2=label_wrap_gen(10) ))
+p2 \%+\% msleep +
+  facet_grid(vore ~ conservation2, labeller = labeller(vore = capitalize))
+p2 \%+\% msleep +
+ facet_grid(vore ~ conservation2, labeller = labeller(conservation2 =
+ label_wrap_gen(10)))
+}
 }
 

man/scale_gradient2.Rd

@@ -77,7 +77,8 @@ d + scale_colour_gradient2(mid=muted("green"), high="white", low="white")
 d + scale_colour_gradient2(midpoint=mean(diamonds$price / diamonds$carat))
 
 # Fill gradients work much the same way
-p <- qplot(letters[1:5], 1:5, fill= c(-3, 3, 5, 2, -2), geom="bar")
+p <- qplot(letters[1:5], 1:5, fill= c(-3, 3, 5, 2, -2), geom = "bar",
+  stat = "identity")
 p + scale_fill_gradient2("fill")
 # Note how positive and negative values of the same magnitude
 # have similar intensity

man/scale_size.Rd

@@ -34,7 +34,7 @@ p + scale_size(range = c(1, 2))
 # Map area, instead of width/radius
 # Perceptually, this is a little better
 p + scale_size_area()
-p + scale_size_area(range = c(1, 25))
+p + scale_size_area(max_size = 25)
 
 # Also works with factors, but not a terribly good
 # idea, unless your factor is ordered, as in this example

man/stat_sum.Rd

@@ -50,7 +50,7 @@ d + stat_sum()
 # by overall proportion
 d + stat_sum(aes(group = 1))
 d + stat_sum(aes(group = 1)) + scale_size(range = c(3, 10))
-d + stat_sum(aes(group = 1)) + scale_size_area(range = c(3, 10))
+d + stat_sum(aes(group = 1)) + scale_size_area(max_size = 10)
 
 # by cut
 d + stat_sum(aes(group = cut))