move subset functions back to their file that will be deleted eventually

microbiome · Apr 18, 2024 · c48d1d8 · c48d1d8
1 parent eb16bec
commit c48d1d8
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 69 deletions.
diff --git a/R/deprecate.R b/R/deprecate.R
@@ -104,54 +104,3 @@ loadFromHumann <- function(...) {
                             " Use 'importHUMAnN' instead."))
     importHUMAnN(...)
 }
-
-#' @rdname deprecate
-#' @export
-setGeneric("subsetSamples", signature = "x",
-            function(x, ...)
-                standardGeneric("subsetSamples"))
-
-#' @rdname deprecate
-#' @export
-setMethod("subsetSamples", signature = "SummarizedExperiment",
-            function(x, ...){
-                .Deprecated(msg = paste0("subsetSamples is deprecated. Please ",
-                                        "use '[]' for subsetting instead."))
-                subset_args <- .get_subset_args(x, ...)
-                x[subset_args$columns,subset_args$rows]
-            }
-)
-
-#' @rdname deprecate
-#' @export
-setGeneric("subsetFeatures", signature = "x",
-            function(x, ...)
-                standardGeneric("subsetFeatures"))
-
-#' @rdname deprecate
-#' @export
-setMethod("subsetFeatures", signature = "SummarizedExperiment",
-            function(x, ...){
-                .Deprecated(msg = paste0("subsetFeatures is deprecated. Please",
-                                        " use '[]' for subsetting instead."))
-                subset_args <- .get_subset_args(x, ...)
-                x[subset_args$rows, subset_args$columns]
-            }
-)
-
-#' @rdname deprecate
-#' @export
-setGeneric("subsetTaxa", signature = "x",
-            function(x, ...)
-                standardGeneric("subsetTaxa"))
-
-#' @rdname deprecate
-#' @export
-setMethod("subsetTaxa", signature = "SummarizedExperiment",
-            function(x, ...){
-                .Deprecated(msg = paste0("subsetFeatures is deprecated. Please",
-                                        " use '[]' for subsetting instead."))
-                subset_args <- .get_subset_args(x, ...)
-                x[subset_args$rows, subset_args$columns]
-            }
-)
diff --git a/R/subset.R b/R/subset.R
@@ -1,3 +1,16 @@
+#' @export
+setGeneric("subsetSamples", signature = "x",
+           function(x, ...)
+               standardGeneric("subsetSamples"))
+#' @export
+setGeneric("subsetFeatures", signature = "x",
+           function(x, ...)
+               standardGeneric("subsetFeatures"))
+#' @export
+setGeneric("subsetTaxa", signature = "x",
+           function(x, ...)
+               standardGeneric("subsetTaxa"))
+
 .get_subset_args <- function(x, subset = NULL, select = NULL, ...){
     rows <- subset
     columns <- select
@@ -9,3 +22,32 @@
     }
     return(list(rows = rows, columns = columns))
 }
+
+#' @export
+setMethod("subsetSamples", signature = "SummarizedExperiment",
+          function(x, ...){
+              .Deprecated(msg = paste0("subsetSamples is deprecated. Please ",
+                                       "use '[]' for subsetting instead."))
+              subset_args <- .get_subset_args(x, ...)
+              x[subset_args$columns,subset_args$rows]
+          }
+)
+
+#' @export
+setMethod("subsetFeatures", signature = "SummarizedExperiment",
+          function(x, ...){
+              .Deprecated(msg = paste0("subsetFeatures is deprecated. Please",
+                                       " use '[]' for subsetting instead."))
+              subset_args <- .get_subset_args(x, ...)
+              x[subset_args$rows, subset_args$columns]
+          }
+)
+
+#' @export
+setMethod("subsetTaxa", signature = "SummarizedExperiment",
+          function(x, ...){
+              .Deprecated(msg = paste0("subsetFeatures is deprecated. Please",
+                                       " use '[]' for subsetting instead."))
+              subsetFeatures(x, ...)
+          }
+)
diff --git a/man/deprecate.Rd b/man/deprecate.Rd