Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions R/seurat.R
Original file line number Diff line number Diff line change
Expand Up @@ -4090,8 +4090,8 @@ setMethod( # because R doesn't allow S3-style [[<- for S4 classes
}
}
# Check to ensure that we aren't adding duplicate names
if (any(colnames(x = meta.data) %in% FilterObjects(object = x))) {
bad.cols <- colnames(x = meta.data)[which(colnames(x = meta.data) %in% FilterObjects(object = x))]
if (any(colnames(x = meta.data) %in% .FilterObjects(object = x))) {
bad.cols <- colnames(x = meta.data)[which(colnames(x = meta.data) %in% .FilterObjects(object = x))]
stop(
paste0(
"Cannot add a metadata column with the same name as an Assay or DimReduc - ",
Expand Down Expand Up @@ -4193,7 +4193,7 @@ setMethod( # because R doesn't allow S3-style [[<- for S4 classes
}
# When removing an Assay, clear out associated DimReducs, Graphs, and SeuratCommands
if (is.null(x = value) && inherits(x = x[[i]], what = 'Assay')) {
objs.assay <- FilterObjects(
objs.assay <- .FilterObjects(
object = x,
classes.keep = c('DimReduc', 'SeuratCommand', 'Graph')
)
Expand Down