Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:satijalab/seurat-private into de…
Browse files Browse the repository at this point in the history
…velop
  • Loading branch information
andrewwbutler committed Jun 26, 2018
2 parents 86b6a20 + c023814 commit 359fc02
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions R/conversion.R
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ Convert.seurat <- function(
from@data <- as.matrix(from@data)
}
sce <- if (class(from@raw.data) %in% c("matrix", "dgTMatrix")) {
SingleCellExperiment::SingleCellExperiment(assays = list(counts = as(from@raw.data[, from@cell.names], "dgCMatrix")))
SingleCellExperiment::SingleCellExperiment(assays = list(counts = as(from@raw.data[rownames(from@data), from@cell.names], "dgCMatrix")))
} else if (inherits(x = from@raw.data, what = "dgCMatrix")) {
SingleCellExperiment::SingleCellExperiment(assays = list(counts = from@raw.data[, from@cell.names]))
SingleCellExperiment::SingleCellExperiment(assays = list(counts = from@raw.data[rownames(from@data), from@cell.names]))
} else {
stop("Invalid class stored in seurat object's raw.data slot")
}
Expand Down

0 comments on commit 359fc02

Please sign in to comment.