Merge 4e00343 into 789e1ec

Author: cpsievert

R/trace_generation.R

@@ -579,14 +579,20 @@ geom2trace <- list(
       # Convert days into milliseconds
       x <- as.numeric(x) * 24 * 60 * 60 * 1000
     }
-    L <- list(x=x,
-              y=data$y,
-              type="bar",
-              name=params$name,
-              text=data$text,
-              marker=list(color=toRGB(params$fill)))
+    # if there is more than one y-value for a particular combination of
+    # x, PANEL, and group; then take the _max_ y.
+    data$x <- x
+    dat <- plyr::ddply(data, c("x", "PANEL", if ("group" %in% names(data)) "group"),
+                       plyr::summarise, count = max(y))
+    L <- list(x = dat$x,
+              y = dat$count,
+              type = "bar",
+              # text only makes sense if no dimension reduction occurred
+              text = if (nrow(dat) == nrow(data)) data$text else NULL,
+              name = params$name,
+              marker = list(color = toRGB(params$fill)))
     if (!is.null(params$colour)) {
-      L$marker$line <- list(color=toRGB(params$colour))
+      L$marker$line <- list(color = toRGB(params$colour))
       L$marker$line$width <- if (is.null(params$size)) 1 else params$size
     }
     if (!is.null(params$alpha)) L$opacity <- params$alpha

tests/testthat/test-ggplot-bar.R

@@ -191,3 +191,16 @@ test_that("geom_bar(position = 'fill') stacks proportions", {
   expect_identical(prop, 1)
 })
 
+d <- head(diamonds, 50)
+gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat = "identity")
+
+test_that("For a given x value, if multiple y exist, sum them. ", {
+  info <- expect_traces(gbar, 1, "category-names")
+  expect_identical(info$traces[[1]]$type, "bar")
+  y <- with(d, tapply(price, cut, sum))
+  # make sure order of counts match
+  y <- y[info$traces[[1]]$x]
+  expect_equal(info$traces[[1]]$y, as.numeric(y))
+})
+
+

tests/testthat/test-ggplot-categorical.R

@@ -11,17 +11,3 @@ test_that("axis type=category when we plot factors", {
 
   save_outputs(gg, "bar-factor-category")
 })
-
-test_that("Bar charts of type=category show category names", {
-  gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat="identity")
-  info <- gg2list(gbar)
-  
-  expect_equal(length(info$data), 1)  # 1 trace
-  expect_identical(info$layout$xaxis$type, "category")
-  expect_identical(info$layout$xaxis$title, "cut")
-  expect_identical(info$layout$yaxis$type, "linear")
-  expect_true(all(c("Fair", "Good", "Very Good", "Premium", "Ideal") %in%
-                    info$data[[1]]$x))
-  
-  save_outputs(gbar, "bar-category-names")
-})