pair -> step in self-adjoin output

corybrunson · Jun 26, 2018 · b09566a · b09566a
1 parent 10a748a
commit b09566a
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 155 deletions.
diff --git a/R/geom-flow.r b/R/geom-flow.r
@@ -102,7 +102,7 @@ GeomFlow <- ggproto(
     aesthetics <- intersect(.color_diff_aesthetics, names(data))
     # arrange data by aesthetics for consistent (reverse) z-ordering
     data <- data[do.call(order, lapply(
-      data[, c("pair", aesthetics)],
+      data[, c("step", aesthetics)],
       function(x) factor(x, levels = unique(x))
     )), ]
 

diff --git a/R/self-adjoin.r b/R/self-adjoin.r
@@ -42,25 +42,25 @@ self_adjoin <- function(
 
   # self-(inner )join `link` variables by `key` and `by`
   adj <- dplyr::inner_join(
-    transform(data, pair = key_num)[, c("pair", by, link)],
-    transform(data, pair = key_num - 1)[, c("pair", by, link)],
-    by = c("pair", by),
+    transform(data, step = key_num)[, c("step", by, link)],
+    transform(data, step = key_num - 1)[, c("step", by, link)],
+    by = c("step", by),
     suffix = suffix
   )
 
   # bind `keep.*` variables
   if (!is.null(keep.x)) {
     adj <- dplyr::left_join(
       adj,
-      transform(data, pair = key_num)[, c("pair", by, keep.x)],
-      by = c("pair", by)
+      transform(data, step = key_num)[, c("step", by, keep.x)],
+      by = c("step", by)
     )
   }
   if (!is.null(keep.y)) {
     adj <- dplyr::left_join(
       adj,
-      transform(data, pair = key_num - 1)[, c("pair", by, keep.y)],
-      by = c("pair", by)
+      transform(data, step = key_num - 1)[, c("step", by, keep.y)],
+      by = c("step", by)
     )
   }
 

diff --git a/docs/articles/ggalluvial.html b/docs/articles/ggalluvial.html
diff --git a/docs/articles/labels.html b/docs/articles/labels.html
diff --git a/docs/articles/labels_files/figure-html/ggrepel-1.png b/docs/articles/labels_files/figure-html/ggrepel-1.png