...
|
...
|
@@ -857,13 +857,13 @@ classify_cells_seurat <-
|
857
|
857
|
if (is.null(classifiers)) {
|
858
|
858
|
model_list <- load_models(path_to_models)
|
859
|
859
|
|
860
|
|
- if (length(cell_types) >= 1 | all(cell_types != "all"))
|
|
860
|
+ if (length(cell_types) >= 1 & all(cell_types != "all"))
|
861
|
861
|
classifiers = model_list[cell_types]
|
862
|
862
|
else classifiers <- model_list
|
863
|
863
|
}
|
864
|
864
|
|
865
|
865
|
union.marker_genes <- unique(unname(unlist(lapply(classifiers,
|
866
|
|
- function(x) marker_genes(x)))))
|
|
866
|
+ function(x) marker_genes(x)))))
|
867
|
867
|
mat = Seurat::GetAssayData(object = classify_obj,
|
868
|
868
|
assay = seurat_assay, slot = seurat_slot)
|
869
|
869
|
# if expression matrix is not dgCMatrix: DelayedMatrix for ex.
|