Use new BiocGenerics::transform() with new signature

DESCRIPTION

@@ -17,7 +17,7 @@ Depends:
     R (>= 3.0.2)
 Imports:
     Biobase,
-    BiocGenerics (>= 0.29.2),
+    BiocGenerics (>= 0.59.5),
     grDevices,
     graphics,
     methods,

NAMESPACE

@@ -118,7 +118,6 @@ export(squareroot)
 export(summarizeFilter)
 export(tail)
 export(timeFilter)
-export(transform)
 export(transformList)
 export(transformReference)
 export(transform_gate)
@@ -272,6 +271,7 @@ importFrom(BiocGenerics,ncol)
 importFrom(BiocGenerics,nrow)
 importFrom(BiocGenerics,sort)
 importFrom(BiocGenerics,toTable)
+importFrom(BiocGenerics,transform)
 importFrom(S4Vectors,DataFrame)
 importFrom(S4Vectors,coolcat)
 importFrom(cytolib,cytolib_LdFlags)

R/AllGenerics.R

@@ -89,14 +89,6 @@ setGeneric("identifier<-",function(object,value)
 
 
 
-## ===========================================================================
-## Generic for transformation (already S3 in base)
-## ---------------------------------------------------------------------------
-#' @export
-setGeneric("transform")
-
-
-
 ## ===========================================================================
 ## Generics for split and Subset (split is already S3 in base)
 ## ---------------------------------------------------------------------------

R/flowFrame-accessors.R

@@ -836,7 +836,7 @@ setMethod("compensate",
 #' 
 #' @name transform
 #' @aliases transform,flowFrame-method transform,flowSet-method
-#' @param _data a flowFrame or flowSet object
+#' @param x a flowFrame or flowSet object
 #' @param translist a transformList object
 #' @param ... other arguments. e.g. `FL1-H` = myFunc(`FL1-H`)
 #' 
@@ -861,6 +861,7 @@ setMethod("compensate",
 #' 
 #' 
 #' @export
+#' @importFrom BiocGenerics transform
 # 
 # We are also making sure that the values of the dynamic range in the
 # parameters slot are transformed accordingly. Note that this does not
@@ -869,8 +870,8 @@ setMethod("compensate",
 # The `FL1-H` = myFunc(`FL1-H` ) form is not intended to be used in programmatic way
 # since use non-standard evalution could fail to find 'myFunc' definition. 
 setMethod("transform",
-          signature=signature(`_data`="flowFrame"),
-          definition=function(`_data`, translist, ...)
+          signature=signature(x="flowFrame"),
+          definition=function(x, translist, ...)
       {
 
           if(!(missing(translist))){
@@ -881,18 +882,17 @@ setMethod("transform",
               err_msg <- paste(err_msg, "!Please make sure the unnamed argument is a valid 'transformList' object!")
               stop(err_msg)
             }else
-                return(translist %on% `_data`)
+                return(translist %on% x)
           }else# dispach to .transform for named argument, assuming it is like `FSC-H`=asinhTrans(`FSC-H`) 
-            .transform(`_data`, ...)
+            .transform(x, ...)
 
       })
 
 #' take formal of transform(fs, `FSC-H`=asinhTrans(`FSC-H`))
 #' which do the lazy evaluation
 #' @noRd
-.transform <- function(`_data`, ...){
+.transform <- function(x, ...){
       e <- substitute(list(...))
-      x <- `_data`
       par <- parameters(x)
       ranges <- range(x)
       tranges <- as.matrix(transform(as.data.frame(ranges),...))

R/flowSet-accessors.R

@@ -427,19 +427,20 @@ setMethod("compensate",
 ## Transformation methods
 ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #' @export
+#' @importFrom BiocGenerics transform
 setMethod("transform",
-		signature=signature(`_data`="flowSet"),
-		definition=function(`_data`, translist, ...)
+		signature=signature(x="flowSet"),
+		definition=function(x, translist, ...)
 		{
 		  if(missing(translist))
-		    fsApply(`_data`,transform, ...)
+		    fsApply(x,transform, ...)
 		  else if(is(translist, "transformList"))
-			  fsApply(`_data`,transform, translist = translist, ...)
+			  fsApply(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 <- copyFlowSet(`_data`)
+		    fs <- copyFlowSet(x)
 		    for(sn in sns)
 		      fs[[sn]] <- transform(fs[[sn]], translist[[sn]])
 		    fs
@@ -449,8 +450,9 @@ setMethod("transform",
 		})
 
 #' @export
+#' @importFrom BiocGenerics transform
 setMethod("transform",
-		signature=signature(`_data`="missing"),
+		signature=signature(x="missing"),
 		definition=function(...)
 		{
 			funs <- list(...)
@@ -752,4 +754,4 @@ flowSet_to_list <- function(fs){
   frs <- lapply(1:length(fs), function(idx) {fs[[idx]]})
   names(frs) <- sampleNames(fs)
   frs
-}
+}

src/inPolygon.cpp

@@ -19,7 +19,7 @@
   int nrd = data.nrow();
   int nrv = vertices.nrow();
 
-  /* check input argument _data */
+  /* check input argument x */
   if(nrd == 0)
   {
     std::vector<bool> res(nrd, false);