Skip to content

Add select_ to support later dplyr #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeffbaumes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add select_ to support later dplyr #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ S3method(print,asrArbor)
S3method(print,treedata)
S3method(reorder,treedata)
S3method(select,treedata)
S3method(select_,treedata)
S3method(summarise,treedata)
S3method(summarize,treedata)
S3method(treedply,treedata)
Expand Down
23 changes: 21 additions & 2 deletions R/treeplyr.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ make.treedata <- function(tree, data, name_column="detect") {
}
if(name_column==0){
dat.label <- rownames(data)
}
dat <- tbl_df(as.data.frame(lapply(1:ncol(data), function(x) type.convert(as.character(data[,x])))))
}
# dat <- tbl_df(as.data.frame(lapply(1:ncol(data), function(x) type.convert(as.character(data[,x])))))
dat <- data

colnames(dat) <- coln
#dat <- apply(dat, 2, type.convert)
if(name_column==0){
Expand Down Expand Up @@ -77,6 +79,23 @@ select.treedata <- function(tdObject, ...){
return(tdObject)
}

if (exists('select_')) {
#' @export
select_.treedata <- function(tdObject, ..., .dots){
dots <- lazyeval::all_dots(.dots, ...)
vars <- select_vars_(names(tdObject$dat), dots)
dat <- tdObject$dat[, vars, drop = FALSE]
row.names(dat) <- attributes(tdObject)$tip.label
tdObject$dat <- dat
return(tdObject)
}
} else {
select_ <- function() {}

#' @export
select_.treedata <- function() {}
}

#' @export
filter.treedata <- function(tdObject, ...){
if(is.null(list(substitute(...))[[1]])) stop("No criteria provided for filtering")
Expand Down