Merge branch 'master' of github.com:hadley/plyr

hadley · Aug 6, 2015 · 9d8294e · 9d8294e
2 parents ed5d482 + 83346d3
commit 9d8294e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/R/rbind-fill-matrix.r b/R/rbind-fill-matrix.r
@@ -70,7 +70,7 @@ rbind.fill.matrix <- function(...) {
 
   ## fill in the new matrix
   for (i in seq_along(rows)) {
-    rng <- seq(pos[i, 1], length = pos[i, 2])
+    rng <- seq(pos[i, 1], length.out = pos[i, 2])
     output[rng, lcols[[i]]] <- matrices[[i]]
   }
 

diff --git a/R/rbind-fill.r b/R/rbind-fill.r
@@ -63,7 +63,7 @@ rbind.fill <- function(...) {
 
   # Copy inputs into output
   for (i in seq_along(rows)) {
-    rng <- seq(pos[i, 1], length = pos[i, 2])
+    rng <- seq(pos[i, 1], length.out = pos[i, 2])
     df <- dfs[[i]]
 
     for (var in names(df)) {

diff --git a/R/vaggregate.r b/R/vaggregate.r
@@ -19,7 +19,7 @@
 #' @export
 #' @examples
 #' # Some examples of use borrowed from ?tapply
-#' n <- 17; fac <- factor(rep(1:3, length = n), levels = 1:5)
+#' n <- 17; fac <- factor(rep(1:3, length.out = n), levels = 1:5)
 #' table(fac)
 #' vaggregate(1:n, fac, sum)
 #' vaggregate(1:n, fac, sum, .default = NA_integer_)

diff --git a/man/vaggregate.Rd b/man/vaggregate.Rd
@@ -33,7 +33,7 @@ because it avoids making a copy of the data.
 }
 \examples{
 # Some examples of use borrowed from ?tapply
-n <- 17; fac <- factor(rep(1:3, length = n), levels = 1:5)
+n <- 17; fac <- factor(rep(1:3, length.out = n), levels = 1:5)
 table(fac)
 vaggregate(1:n, fac, sum)
 vaggregate(1:n, fac, sum, .default = NA_integer_)