Skip to content

Commit

Permalink
importFrom clue,solve_LSAP
Browse files Browse the repository at this point in the history
  • Loading branch information
mikejiang committed Jul 18, 2023
1 parent 5b5dfe2 commit a2783c2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ Encoding: UTF-8
Depends: R (>= 3.0.2)
Imports: BiocGenerics, MASS, flowCore (>= 1.99.6), flowWorkspace, ncdfFlow(>= 2.19.5), flowViz, fda (>= 2.2.6),
Biobase, methods, grDevices, graphics, stats, cluster, utils, KernSmooth, lattice, ks, RColorBrewer, rrcov, corpcor,
mnormt
mnormt, clue
Enhances: RBGL,graph
License: Artistic-2.0
Lazyload: yes
URL: http://www.github.com/RGLab/flowStats
BugReports: http://www.github.com/RGLab/flowStats/issues
biocViews: ImmunoOncology, FlowCytometry, CellBasedAssays
RoxygenNote: 7.1.2
RoxygenNote: 7.2.3
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ importMethodsFrom(BiocGenerics, cbind, colnames, lapply, mapply, order,
table, unique)
importFrom(corpcor,cov.shrink)

importFrom(clue,solve_LSAP)
importFrom(grDevices,cm.colors)
importFrom(grDevices,gray)
importFrom(grDevices,heat.colors)
Expand Down
3 changes: 2 additions & 1 deletion R/spillover.R
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
#' of the New York Academy of Sciences, 677:167-184.
#' @keywords methods
#' @export
#' @importFrom clue solve_LSAP
setMethod("spillover",
signature = signature(x = "flowSet"),
definition = function(x, unstained = NULL, fsc = "FSC-A",
Expand Down Expand Up @@ -203,7 +204,7 @@ setMethod("spillover",
dists = sapply(colnames(inten),function(x)adist(x,rownames(inten)))
colnames(dists)=colnames(inten)
rownames(dists)=rownames(inten)
solution=clue::solve_LSAP(t(dists))
solution=solve_LSAP(t(dists))
channel_order <- as.vector(solution)
for(i in 1:ncol(dists)){
cat("matching ",colnames(dists)[i]," to ", rownames(dists)[channel_order[i]],"\n")
Expand Down

0 comments on commit a2783c2

Please sign in to comment.