Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Depends:
methods,
BH
Imports:
Biobase,BiocGenerics,flowCore
Biobase, BiocGenerics (>= 0.59.5), flowCore
Suggests:
testthat,parallel,flowStats,knitr
License: AGPL-3.0-only
Expand Down
14 changes: 7 additions & 7 deletions R/ncdfFlowSet-accessors.R
Original file line number Diff line number Diff line change
Expand Up @@ -451,24 +451,24 @@ setMethod("compensate",
fs.clone
})

#' @param _data \code{ncdfFlowSet}
#' @param x \code{ncdfFlowSet}
#' @param translist a 'transformList' object or a list of 'transformList' objects
#' @param ... other arguments
#' @rdname flowSet-accessor
#' @export
setMethod("transform",
signature=signature(`_data`="ncdfFlowSet"),
definition=function(`_data`, translist,...)
signature=signature(x="ncdfFlowSet"),
definition=function(x, translist,...)
{
if(missing(translist))
ncfsApply(`_data`,transform,...)
ncfsApply(x,transform,...)
else if(is(translist, "transformList"))
ncfsApply(`_data`,transform, translist = translist, ...)
ncfsApply(x,transform, translist = translist, ...)
else if(is(translist, "list")){
sns <- sampleNames(`_data`)
sns <- sampleNames(x)
if(!setequal(sns, names(translist)))
stop("names of 'translist' must be consistent with flow data!")
fs <- clone.ncdfFlowSet(`_data`, ...)
fs <- clone.ncdfFlowSet(x, ...)
for(sn in sns)
fs[[sn]] <- transform(fs[[sn]], translist[[sn]])
fs
Expand Down
4 changes: 1 addition & 3 deletions man/flowSet-accessor.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.