@@ -39,6 +39,6 @@ amv_dimnames <- function(x) { #' @arguments array #' @keywords internal reduce_dim <- function(x) { - do.call("[", c(list(x), lapply(dim(x), function(x) if (x==1) 1 else T), drop=TRUE)) + do.call("[", c(list(x), lapply(dim(x), function(x) if (x==1) 1 else TRUE), drop=TRUE)) } R/dimensions.r @@ -14,7 +14,7 @@ #' @keywords manip #' @examples #' first <- ddply(baseball, "id", summarise, first = min(year)) -#' system.time(b2 <- merge(baseball, first, by = "id", all.x = T)) +#' system.time(b2 <- merge(baseball, first, by = "id", all.x = TRUE)) #' system.time(b3 <- join(baseball, first, by = "id")) join <- function(x, y, by = intersect(names(x), names(y)), type = "left") { type <- match.arg(type, c("left", "right", "inner", "full")) R/join.r @@ -51,7 +51,7 @@ rbind.fill <- function(...) { } # Compute start and end positions for each data frame - pos <- matrix(cumsum(rbind(1, rows - 1)), ncol = 2, byrow = T) + pos <- matrix(cumsum(rbind(1, rows - 1)), ncol = 2, byrow = TRUE) for(i in seq_along(rows)) { rng <- pos[i, 1]:pos[i, 2] R/rbind.r @@ -3,4 +3,4 @@ library(plyr, warn.conflicts = FALSE) frame_files <- compact(llply(sys.frames(), function(x) x$ofile)) PATH <- dirname(frame_files[[length(frame_files)]]) -lapply(dir(file.path(PATH, "R"), full.name=T), source) +lapply(dir(file.path(PATH, "R"), full.name=TRUE), source) load.r @@ -15,5 +15,5 @@ would use a sql join.} \item{by}{character vector of variable names to join by} \item{join}{type of join: left (default), right, inner or full.}} \examples{first <- ddply(baseball, "id", summarise, first = min(year)) -system.time(b2 <- merge(baseball, first, by = "id", all.x = T)) +system.time(b2 <- merge(baseball, first, by = "id", all.x = TRUE)) system.time(b3 <- join(baseball, first, by = "id"))} man/join.Rd @@ -16,7 +16,7 @@ rownames(bsmall) <- NULL first <- ddply(bsmall, "id", summarise, first = min(year)) test_that("results consistent with merge", { - b2 <- merge(bsmall, first, by = "id", all.x = T) + b2 <- merge(bsmall, first, by = "id", all.x = TRUE) b3 <- join(bsmall, first, by = "id") b2 <- arrange(b2, id, year, stint) tests/test-join.r @@ -3,6 +3,6 @@ context("Split data frame") df <- data.frame(x = factor(1:10), y = letters[1:10]) test_that("correct order is used", { - expect_that(ddply(df, .(x), .drop = F), equals(df)) - expect_that(ddply(df, .(x), .drop = T), equals(df)) + expect_that(ddply(df, .(x), .drop = FALSE), equals(df)) + expect_that(ddply(df, .(x), .drop = TRUE), equals(df)) }) \ No newline at end of file tests/test-split-data-frame.r 073ab256a2ee282c28f79fe2f927d90a869c4c8f hadley h.wickham@gmail.com http://github.com/hadley/plyr/commit/f841ae73600c29a93a9ef801ddf5dbbf8438f8d8 f841ae73600c29a93a9ef801ddf5dbbf8438f8d8 2009-09-14T08:37:09-07:00 2009-09-14T08:37:09-07:00 Expand T and F 8ac36666a3c6ac71b3b596c3e7e603ba7727f8a5 hadley h.wickham@gmail.com