Skip to content

Commit

Permalink
Added NEWS file. Minor text edits to clustsignal function.
Browse files Browse the repository at this point in the history
  • Loading branch information
PratibhaPanwar committed Nov 28, 2024
1 parent 8abbcca commit e8ac624
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: clustSIGNAL
Type: Package
Title: clustSIGNAL: a spatial clustering method
Version: 0.99.3
Version: 0.99.4
Authors@R: c(
person("Pratibha", "Panwar", email = "[email protected]",
role = c("cre", "aut", "ctb"), comment = c(ORCID = "0000-0002-7437-7084")),
Expand Down
13 changes: 13 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## clustSIGNAL v0.99.4 (2024-11-28)
* Corrected character check for output format type.

## clustSIGNAL v0.00.3 (2024-10-31)
* Clustering parameter options added to package
* Initial and final clustering steps are now in separate functions
* Test units added to the package

## clustSIGNAL v0.00.2 (2024-10-08)
* Updated parallel runs in smoothing function for faster runs

## clustSIGNAL v0.99.0 (2024-09-19)
* Submitted to Bioconductor.
6 changes: 2 additions & 4 deletions R/clustSIGNAL.R
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ clustSIGNAL <- function (spe, samples, cells, dimRed = "None", batch = FALSE,
stop("NN cannot be less than 1.")
} else if (!(kernel %in% c("G", "E"))) {
stop("Invalid kernel type.")
} else if (!(outputs %in% c('c', 'n', 's', 'a'))) {
stop("Invalid output type.")}
} else if (!(outputs %in% c('c', 'a'))) {
stop("Invalid character for output type.")}

if (dimRed == "None") {
show(paste("Calculating PCA. Time", format(Sys.time(),'%H:%M:%S')))
Expand All @@ -99,7 +99,6 @@ clustSIGNAL <- function (spe, samples, cells, dimRed = "None", batch = FALSE,
show(paste("clustSIGNAL run started. Time", format(Sys.time(),'%H:%M:%S')))

# Non-spatial clustering to identify initial cluster groups
# reclust should always be FALSE here
spe <- p1_clustering(spe, dimRed, batch, batch_by, clustParams)
# Neighborhood detection, and sorting if sort = TRUE
outReg <- neighbourDetect(spe, samples, NN, cells, sort)
Expand All @@ -108,7 +107,6 @@ clustSIGNAL <- function (spe, samples, cells, dimRed = "None", batch = FALSE,
# Weighted smoothing guided by neighbourhood entropy
spe <- adaptiveSmoothing(spe, outReg$nnCells, NN, kernel, spread, threads)
# Non-spatial clustering of adaptively smoothed expression
# reclust should always be TRUE here
spe <- p2_clustering(spe, batch, batch_by, clustParams)

cluster_df <- data.frame("Cells" = spe[[cells]],
Expand Down

0 comments on commit e8ac624

Please sign in to comment.