@@ -179,5 +179,8 @@ subsetSCECols <- function(inSCE, index = NULL, bool = NULL, colData = NULL) {

   }

   inSCE <- inSCE[,final.ix]

+  if(!is.null(metadata(inSCE)$seurat$obj)){

+    metadata(inSCE)$seurat$obj@meta.data <- metadata(inSCE)$seurat$obj@meta.data[final.ix, ] 

+  }

   return(inSCE)

   }

@@ -179,5 +179,9 @@ subsetSCECols <- function(inSCE, index = NULL, bool = NULL, colData = NULL) {

   }

   inSCE <- inSCE[,final.ix]

+

+  if(!is.null(S4Vectors::metadata(inSCE)$seurat$obj)){

+    S4Vectors::metadata(inSCE)$seurat$obj@meta.data <- S4Vectors::metadata(inSCE)$seurat$obj@meta.data[final.ix, ]

+  }

   return(inSCE)

   }

@@ -52,7 +52,7 @@ subsetSCERows <- function(inSCE, index = NULL, bool = NULL, rowData = NULL,

   if(is.null(index) & is.null(bool) & is.null(rowData)) {

     stop("At least one of 'index', 'bool', or 'rowData' must be supplied.")

   }

-  final.ix <- rep(FALSE, nrow(inSCE))

+  final.ix <- rep(TRUE, nrow(inSCE))

   # Parse index containing integers

   if(!is.null(index)) {

@@ -60,7 +60,7 @@ subsetSCERows <- function(inSCE, index = NULL, bool = NULL, rowData = NULL,

       stop("'index' must contain integers between 1 and the number of rows ",

            "in 'inSCE': ", nrow(inSCE))

     }

-    final.ix[index] <- TRUE

+    final.ix[!seq(nrow(inSCE)) %in% index] <- FALSE

   }

   # Parse Boolean vector

@@ -69,12 +69,11 @@ subsetSCERows <- function(inSCE, index = NULL, bool = NULL, rowData = NULL,

       stop("'bool' must be a logical vector the same length as the number of ",

            "rows in 'inSCE': ", nrow(inSCE))

     }

-    final.ix[bool] <- TRUE

+    final.ix[!bool] <- FALSE

   }

   # Parse expressions for rowData variables

   if(!is.null(rowData)) {

-    temp <- rep(TRUE, nrow(inSCE))

     for(i in seq_along(rowData)) {

       temp <- eval(parse(text = as.character(rowData[i])),

                    envir = as.data.frame(rowData(inSCE)))

@@ -107,9 +106,6 @@ subsetSCERows <- function(inSCE, index = NULL, bool = NULL, rowData = NULL,

   return(inSCE)

 }

-

-

-

 #' @title Subset a SingleCellExperiment object by columns

 #' @description Used to peform subsetting of a

 #' \linkS4class{SingleCellExperiment} object using a variety of methods that

@@ -146,7 +142,7 @@ subsetSCECols <- function(inSCE, index = NULL, bool = NULL, colData = NULL) {

   if(is.null(index) & is.null(bool) & is.null(colData)) {

     stop("At least one of 'index', 'bool', or 'colData' must be supplied.")

   }

-  final.ix <- rep(FALSE, ncol(inSCE))

+  final.ix <- rep(TRUE, ncol(inSCE))

   # Parse index containing integers

   if(!is.null(index)) {

@@ -154,7 +150,7 @@ subsetSCECols <- function(inSCE, index = NULL, bool = NULL, colData = NULL) {

       stop("'index' must contain integers between 1 and the number of columns ",

            "in 'inSCE': ", ncol(inSCE))

     }

-    final.ix[index] <- TRUE

+    final.ix[!seq(ncol(inSCE)) %in% index] <- FALSE

   }

   # Parse Boolean vector

@@ -163,12 +159,11 @@ subsetSCECols <- function(inSCE, index = NULL, bool = NULL, colData = NULL) {

       stop("'bool' must be a logical vector the same length as the number of ",

            "colmns in 'inSCE': ", ncol(inSCE))

     }

-    final.ix[bool] <- TRUE

+    final.ix[!bool] <- FALSE

   }

   # Parse expressions for colData variables

   if(!is.null(colData)) {

-    final.ix <- rep(TRUE, ncol(inSCE))

     for(i in seq_along(colData)) {

       temp <- eval(parse(text = as.character(colData[i])),

                    envir = as.data.frame(colData(inSCE)))

@@ -74,6 +74,7 @@ subsetSCERows <- function(inSCE, index = NULL, bool = NULL, rowData = NULL,

   # Parse expressions for rowData variables

   if(!is.null(rowData)) {

+    temp <- rep(TRUE, nrow(inSCE))

     for(i in seq_along(rowData)) {

       temp <- eval(parse(text = as.character(rowData[i])),

                    envir = as.data.frame(rowData(inSCE)))

@@ -84,7 +85,7 @@ subsetSCERows <- function(inSCE, index = NULL, bool = NULL, rowData = NULL,

              "trying to use matches one of the column names in ",

              "'rowData(inSCE)' and that your expression is valid.")

       }

-      final.ix[temp] = TRUE

+      final.ix[!temp] <- FALSE

     }

   }

@@ -167,6 +168,7 @@ subsetSCECols <- function(inSCE, index = NULL, bool = NULL, colData = NULL) {

   # Parse expressions for colData variables

   if(!is.null(colData)) {

+    final.ix <- rep(TRUE, ncol(inSCE))

     for(i in seq_along(colData)) {

       temp <- eval(parse(text = as.character(colData[i])),

                    envir = as.data.frame(colData(inSCE)))

@@ -177,7 +179,7 @@ subsetSCECols <- function(inSCE, index = NULL, bool = NULL, colData = NULL) {

              "trying to use matches one of the column names in ",

              "'colData(inSCE)' and that your expression is valid.")

       }

-      final.ix[temp] = TRUE

+      final.ix[!temp] <- FALSE

     }

   }

@@ -6,7 +6,7 @@

 #' with one another. If \code{returnAsAltExp} is set to \code{TRUE},

 #' then the returned object will have the same number of rows as the input

 #' \code{inSCE} as the subsetted object will be stored in the

-#' \code{\link[SingleCellExperiment]{altExp}} slot.

+#' \code{\link{altExp}} slot.

 #' @param inSCE Input \linkS4class{SingleCellExperiment} object.

 #' @param index Integer vector. Vector of indicies indicating which rows

 #' to keep. If \code{NULL}, this will not be used for subsetting.

@@ -6,7 +6,7 @@

 #' with one another. If \code{returnAsAltExp} is set to \code{TRUE},

 #' then the returned object will have the same number of rows as the input

 #' \code{inSCE} as the subsetted object will be stored in the

-#' \code{\link[SingleCellExperiment]{altExp}} slot.  

+#' \code{\link[SingleCellExperiment]{altExp}} slot.

 #' @param inSCE Input \linkS4class{SingleCellExperiment} object.

 #' @param index Integer vector. Vector of indicies indicating which rows

 #' to keep. If \code{NULL}, this will not be used for subsetting.

@@ -18,13 +18,13 @@

 #' @param rowData Character. An expression that will identify a subset of rows

 #' using variables found in the \code{rowData} of \code{inSCE}. For example,

 #' if \code{x} is a numeric vector in \code{rowData}, then \code{"x < 5"} will

-#' return all rows with x less than 5. Single quotes should be used for 

+#' return all rows with x less than 5. Single quotes should be used for

 #' character strings. For example, \code{"y == 'yes'"} will return all

 #' rows where y is "yes". Multiple expressions can be evaluated by placing them

 #' in a vector. For example \code{c("x < 5", "y =='yes'")} will apply both

 #' operations for subsetting. If \code{NULL}, this will not be used for

 #' subsetting. Default \code{NULL}.

-#' @param returnAsAltExp Boolean. If \code{TRUE}, the subsetted 

+#' @param returnAsAltExp Boolean. If \code{TRUE}, the subsetted

 #' \linkS4class{SingleCellExperiment} object will be returned in the

 #' \code{altExp} slot of \code{inSCE}. If \code{FALSE}, the subsetted

 #' \linkS4class{SingleCellExperiment} object will be directly returned.

@@ -34,24 +34,26 @@

 #' be added to the beginning of the assay names in the \code{altExp} object.

 #' This is only utilized if \code{returnAsAltExp = TRUE}. Default \code{TRUE}.

 #' @author Joshua D. Campbell

+#' @return A \link[SingleCellExperiment]{SingleCellExperiment} object that has

+#' been subsetted by rowData.

 #' @examples

 #' data(scExample)

-#' 

+#'

 #' # Set a variable up in the rowData indicating mitochondrial genes

 #' rowData(sce)$isMito <- ifelse(grepl("^MT-", rowData(sce)$feature_name),

 #'                               "yes", "no")

-#' sce <- subsetSCERows(sce, rowData = "isMito == 'yes'")                          

+#' sce <- subsetSCERows(sce, rowData = "isMito == 'yes'")

 #' @export

 #' @importFrom SummarizedExperiment assays assays<-

 subsetSCERows <- function(inSCE, index = NULL, bool = NULL, rowData = NULL,

                           returnAsAltExp = TRUE, altExpName = "subset",

                           prependAltExpName = TRUE) {

-  

+

   if(is.null(index) & is.null(bool) & is.null(rowData)) {

     stop("At least one of 'index', 'bool', or 'rowData' must be supplied.")

   }

   final.ix <- rep(FALSE, nrow(inSCE))

-  

+

   # Parse index containing integers

   if(!is.null(index)) {

     if(min(index) < 1 | max(index) > nrow(inSCE)) {

@@ -60,7 +62,7 @@ subsetSCERows <- function(inSCE, index = NULL, bool = NULL, rowData = NULL,

     }

     final.ix[index] <- TRUE

   }

-  

+

   # Parse Boolean vector

   if(!is.null(bool)) {

     if(length(bool) != nrow(inSCE) | !is.logical(bool)) {

@@ -69,14 +71,14 @@ subsetSCERows <- function(inSCE, index = NULL, bool = NULL, rowData = NULL,

     }

     final.ix[bool] <- TRUE

   }

-  

+

   # Parse expressions for rowData variables

   if(!is.null(rowData)) {

     for(i in seq_along(rowData)) {

       temp <- eval(parse(text = as.character(rowData[i])),

                    envir = as.data.frame(rowData(inSCE)))

       if(length(temp) != nrow(inSCE) | !is.logical(temp)) {

-        stop("The expression ", rowData[i], " did not produce a boolean ", 

+        stop("The expression ", rowData[i], " did not produce a boolean ",

              "vector the same length as the number of rows in 'inSCE'. ",

              "Please ensure that the spelling of the variable you are ",

              "trying to use matches one of the column names in ",

@@ -85,7 +87,7 @@ subsetSCERows <- function(inSCE, index = NULL, bool = NULL, rowData = NULL,

       final.ix[temp] = TRUE

     }

   }

-  

+

   # Filter object and return in different ways depending on flag

   temp.SCE <- inSCE[final.ix,]

   if(isTRUE(returnAsAltExp)) {

@@ -95,7 +97,7 @@ subsetSCERows <- function(inSCE, index = NULL, bool = NULL, rowData = NULL,

            is going to be saved as an ", "'altExp' object.")

     }

     if(isTRUE(prependAltExpName)) {

-      names(assays(temp.SCE)) <- paste0(altExpName, names(assays(temp.SCE)))  

+      names(assays(temp.SCE)) <- paste0(altExpName, names(assays(temp.SCE)))

     }

     SingleCellExperiment::altExp(inSCE, altExpName) <- temp.SCE

   } else {

@@ -112,7 +114,7 @@ subsetSCERows <- function(inSCE, index = NULL, bool = NULL, rowData = NULL,

 #' \linkS4class{SingleCellExperiment} object using a variety of methods that

 #' indicate the correct columns to keep. The various methods,

 #' \code{index}, \code{bool}, and \code{colData}, can be used in conjunction

-#' with one another. 

+#' with one another.

 #' @param inSCE Input \linkS4class{SingleCellExperiment} object.

 #' @param index Integer vector. Vector of indicies indicating which columns

 #' to keep. If \code{NULL}, this will not be used for subsetting.

@@ -128,21 +130,23 @@ subsetSCERows <- function(inSCE, index = NULL, bool = NULL, rowData = NULL,

 #' Single quotes should be used for character strings. For example,

 #' \code{"y == 'yes'"} will return all columns where y is "yes".

 #' Multiple expressions can be evaluated by placing them in a vector.

-#' For example \code{c("x < 5", "y =='yes'")} will apply both operations for 

+#' For example \code{c("x < 5", "y =='yes'")} will apply both operations for

 #' subsetting. If \code{NULL}, this will not be used for subsetting.

 #' Default \code{NULL}.

+#' @return A \link[SingleCellExperiment]{SingleCellExperiment} object that has

+#' been subsetted by colData.

 #' @author Joshua D. Campbell

 #' @examples

 #' data(scExample)

-#' sce <- subsetSCECols(sce, colData = "type != 'EmptyDroplet'")                          

+#' sce <- subsetSCECols(sce, colData = "type != 'EmptyDroplet'")

 #' @export

 subsetSCECols <- function(inSCE, index = NULL, bool = NULL, colData = NULL) {

-  

+

   if(is.null(index) & is.null(bool) & is.null(colData)) {

     stop("At least one of 'index', 'bool', or 'colData' must be supplied.")

   }

   final.ix <- rep(FALSE, ncol(inSCE))

-  

+

   # Parse index containing integers

   if(!is.null(index)) {

     if(min(index) < 1 | max(index) > ncol(inSCE)) {

@@ -151,7 +155,7 @@ subsetSCECols <- function(inSCE, index = NULL, bool = NULL, colData = NULL) {

     }

     final.ix[index] <- TRUE

   }

-  

+

   # Parse Boolean vector

   if(!is.null(bool)) {

     if(length(bool) != ncol(inSCE) | !is.logical(bool)) {

@@ -160,14 +164,14 @@ subsetSCECols <- function(inSCE, index = NULL, bool = NULL, colData = NULL) {

     }

     final.ix[bool] <- TRUE

   }

-  

+

   # Parse expressions for colData variables

   if(!is.null(colData)) {

     for(i in seq_along(colData)) {

       temp <- eval(parse(text = as.character(colData[i])),

                    envir = as.data.frame(colData(inSCE)))

       if(length(temp) != ncol(inSCE) | !is.logical(temp)) {

-        stop("The expression ", colData[i], " did not produce a boolean ", 

+        stop("The expression ", colData[i], " did not produce a boolean ",

              "vector the same length as the number of columns in 'inSCE'. ",

              "Please ensure that the spelling of the variable you are ",

              "trying to use matches one of the column names in ",

@@ -176,7 +180,7 @@ subsetSCECols <- function(inSCE, index = NULL, bool = NULL, colData = NULL) {

       final.ix[temp] = TRUE

     }

   }

-  

+

   inSCE <- inSCE[,final.ix]

   return(inSCE)

   }

@@ -42,6 +42,7 @@

 #'                               "yes", "no")

 #' sce <- subsetSCERows(sce, rowData = "isMito == 'yes'")                          

 #' @export

+#' @importFrom SummarizedExperiment assays assays<-

 subsetSCERows <- function(inSCE, index = NULL, bool = NULL, rowData = NULL,

                           returnAsAltExp = TRUE, altExpName = "subset",

                           prependAltExpName = TRUE) {

@@ -178,4 +179,4 @@ subsetSCECols <- function(inSCE, index = NULL, bool = NULL, colData = NULL) {

   inSCE <- inSCE[,final.ix]

   return(inSCE)

-  }

\ No newline at end of file

+  }

new file mode 100644

@@ -0,0 +1,181 @@

+#' @title Subset a SingleCellExperiment object by rows

+#' @description Used to peform subsetting of a

+#' \linkS4class{SingleCellExperiment} object using a variety of methods that

+#' indicate the correct rows to keep. The various methods,

+#' \code{index}, \code{bool}, and \code{rowData}, can be used in conjunction

+#' with one another. If \code{returnAsAltExp} is set to \code{TRUE},

+#' then the returned object will have the same number of rows as the input

+#' \code{inSCE} as the subsetted object will be stored in the

+#' \code{\link[SingleCellExperiment]{altExp}} slot.  

+#' @param inSCE Input \linkS4class{SingleCellExperiment} object.

+#' @param index Integer vector. Vector of indicies indicating which rows

+#' to keep. If \code{NULL}, this will not be used for subsetting.

+#' Default \code{NULL}.

+#' @param bool Boolean vector. Vector of \code{TRUE} or \code{FALSE}

+#' indicating which rows should be kept. Needs to be the same length as the

+#' number of rows in \code{inSCE}. If \code{NULL}, this will not be used

+#' for subsetting. Default \code{NULL}.

+#' @param rowData Character. An expression that will identify a subset of rows

+#' using variables found in the \code{rowData} of \code{inSCE}. For example,

+#' if \code{x} is a numeric vector in \code{rowData}, then \code{"x < 5"} will

+#' return all rows with x less than 5. Single quotes should be used for 

+#' character strings. For example, \code{"y == 'yes'"} will return all

+#' rows where y is "yes". Multiple expressions can be evaluated by placing them

+#' in a vector. For example \code{c("x < 5", "y =='yes'")} will apply both

+#' operations for subsetting. If \code{NULL}, this will not be used for

+#' subsetting. Default \code{NULL}.

+#' @param returnAsAltExp Boolean. If \code{TRUE}, the subsetted 

+#' \linkS4class{SingleCellExperiment} object will be returned in the

+#' \code{altExp} slot of \code{inSCE}. If \code{FALSE}, the subsetted

+#' \linkS4class{SingleCellExperiment} object will be directly returned.

+#' @param altExpName Character. Name of the alternative experiment object to

+#' add if \code{returnAsAltExp = TRUE}. Default \code{subset}.

+#' @param prependAltExpName Boolean. If \code{TRUE}, \code{altExpName} will

+#' be added to the beginning of the assay names in the \code{altExp} object.

+#' This is only utilized if \code{returnAsAltExp = TRUE}. Default \code{TRUE}.

+#' @author Joshua D. Campbell

+#' @examples

+#' data(scExample)

+#' 

+#' # Set a variable up in the rowData indicating mitochondrial genes

+#' rowData(sce)$isMito <- ifelse(grepl("^MT-", rowData(sce)$feature_name),

+#'                               "yes", "no")

+#' sce <- subsetSCERows(sce, rowData = "isMito == 'yes'")                          

+#' @export

+subsetSCERows <- function(inSCE, index = NULL, bool = NULL, rowData = NULL,

+                          returnAsAltExp = TRUE, altExpName = "subset",

+                          prependAltExpName = TRUE) {

+  

+  if(is.null(index) & is.null(bool) & is.null(rowData)) {

+    stop("At least one of 'index', 'bool', or 'rowData' must be supplied.")

+  }

+  final.ix <- rep(FALSE, nrow(inSCE))

+  

+  # Parse index containing integers

+  if(!is.null(index)) {

+    if(min(index) < 1 | max(index) > nrow(inSCE)) {

+      stop("'index' must contain integers between 1 and the number of rows ",

+           "in 'inSCE': ", nrow(inSCE))

+    }

+    final.ix[index] <- TRUE

+  }

+  

+  # Parse Boolean vector

+  if(!is.null(bool)) {

+    if(length(bool) != nrow(inSCE) | !is.logical(bool)) {

+      stop("'bool' must be a logical vector the same length as the number of ",

+           "rows in 'inSCE': ", nrow(inSCE))

+    }

+    final.ix[bool] <- TRUE

+  }

+  

+  # Parse expressions for rowData variables

+  if(!is.null(rowData)) {

+    for(i in seq_along(rowData)) {

+      temp <- eval(parse(text = as.character(rowData[i])),

+                   envir = as.data.frame(rowData(inSCE)))

+      if(length(temp) != nrow(inSCE) | !is.logical(temp)) {

+        stop("The expression ", rowData[i], " did not produce a boolean ", 

+             "vector the same length as the number of rows in 'inSCE'. ",

+             "Please ensure that the spelling of the variable you are ",

+             "trying to use matches one of the column names in ",

+             "'rowData(inSCE)' and that your expression is valid.")

+      }

+      final.ix[temp] = TRUE

+    }

+  }

+  

+  # Filter object and return in different ways depending on flag

+  temp.SCE <- inSCE[final.ix,]

+  if(isTRUE(returnAsAltExp)) {

+    if(is.null(altExpName) || length(altExpName) > 1

+                           || !is.character(altExpName)) {

+      stop("'altExpName' needs to be a character of length 1 if the subset

+           is going to be saved as an ", "'altExp' object.")

+    }

+    if(isTRUE(prependAltExpName)) {

+      names(assays(temp.SCE)) <- paste0(altExpName, names(assays(temp.SCE)))  

+    }

+    SingleCellExperiment::altExp(inSCE, altExpName) <- temp.SCE

+  } else {

+    inSCE <- temp.SCE

+  }

+  return(inSCE)

+}

+

+

+

+

+#' @title Subset a SingleCellExperiment object by columns

+#' @description Used to peform subsetting of a

+#' \linkS4class{SingleCellExperiment} object using a variety of methods that

+#' indicate the correct columns to keep. The various methods,

+#' \code{index}, \code{bool}, and \code{colData}, can be used in conjunction

+#' with one another. 

+#' @param inSCE Input \linkS4class{SingleCellExperiment} object.

+#' @param index Integer vector. Vector of indicies indicating which columns

+#' to keep. If \code{NULL}, this will not be used for subsetting.

+#' Default \code{NULL}.

+#' @param bool Boolean vector. Vector of \code{TRUE} or \code{FALSE}

+#' indicating which columns should be kept. Needs to be the same length as the

+#' number of columns in \code{inSCE}. If \code{NULL}, this will not be used

+#' for subsetting. Default \code{NULL}.

+#' @param colData Character. An expression that will identify a subset of

+#' columns using variables found in the \code{colData} of \code{inSCE}.

+#' For example, if \code{x} is a numeric vector in \code{colData},

+#' then \code{"x < 5"} will return all columns with x less than 5.

+#' Single quotes should be used for character strings. For example,

+#' \code{"y == 'yes'"} will return all columns where y is "yes".

+#' Multiple expressions can be evaluated by placing them in a vector.

+#' For example \code{c("x < 5", "y =='yes'")} will apply both operations for 

+#' subsetting. If \code{NULL}, this will not be used for subsetting.

+#' Default \code{NULL}.

+#' @author Joshua D. Campbell

+#' @examples

+#' data(scExample)

+#' sce <- subsetSCECols(sce, colData = "type != 'EmptyDroplet'")                          

+#' @export

+subsetSCECols <- function(inSCE, index = NULL, bool = NULL, colData = NULL) {

+  

+  if(is.null(index) & is.null(bool) & is.null(colData)) {

+    stop("At least one of 'index', 'bool', or 'colData' must be supplied.")

+  }

+  final.ix <- rep(FALSE, ncol(inSCE))

+  

+  # Parse index containing integers

+  if(!is.null(index)) {

+    if(min(index) < 1 | max(index) > ncol(inSCE)) {

+      stop("'index' must contain integers between 1 and the number of columns ",

+           "in 'inSCE': ", ncol(inSCE))

+    }

+    final.ix[index] <- TRUE

+  }

+  

+  # Parse Boolean vector

+  if(!is.null(bool)) {

+    if(length(bool) != ncol(inSCE) | !is.logical(bool)) {

+      stop("'bool' must be a logical vector the same length as the number of ",

+           "colmns in 'inSCE': ", ncol(inSCE))

+    }

+    final.ix[bool] <- TRUE

+  }

+  

+  # Parse expressions for colData variables

+  if(!is.null(colData)) {

+    for(i in seq_along(colData)) {

+      temp <- eval(parse(text = as.character(colData[i])),

+                   envir = as.data.frame(colData(inSCE)))

+      if(length(temp) != ncol(inSCE) | !is.logical(temp)) {

+        stop("The expression ", colData[i], " did not produce a boolean ", 

+             "vector the same length as the number of columns in 'inSCE'. ",

+             "Please ensure that the spelling of the variable you are ",

+             "trying to use matches one of the column names in ",

+             "'colData(inSCE)' and that your expression is valid.")

+      }

+      final.ix[temp] = TRUE

+    }

+  }

+  

+  inSCE <- inSCE[,final.ix]

+  return(inSCE)

+  }

\ No newline at end of file