Skip to content

Commit

Permalink
alters data frame sorting code for R 4.x compatibility - thanks to Ax…
Browse files Browse the repository at this point in the history
…el Künstner
  • Loading branch information
chrisamiller committed Oct 12, 2023
1 parent 50031ed commit 795d2da
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Package: sciClone
Title: Detect subclones from genomic sequence data
Version: 1.1.0
Version: 1.1.1
Author: Chris Miller, Brian White, Nathan Dees
Description: Identifies clonal entities from sequenced populations of cells, using read count information.
Maintainer: Chris Miller <[email protected]>
LazyLoad: yes
License: Apache License 2.0 | file LICENSE
Depends: IRanges, bmm, rgl, RColorBrewer, ggplot2, grid, plotrix,
methods, NORMT3, MKmisc, TeachingDemos
Packaged: 2016-03-20 11:07:15 PM; cmiller
methods, NORMT3, MKmisc, TeachingDemos, dplyr
Packaged: 2023-10-11 05:03:14 PM; cmiller
5 changes: 4 additions & 1 deletion R/sciClone.R
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ sciClone <- function(vafs, copyNumberCalls=NULL, regionsToExclude=NULL,
copyNumberMargins=0.25, maximumClusters=10, annotation=NULL,
doClusteringAlongMargins=TRUE, plotIntermediateResults=0){

suppressPackageStartupMessages(library(dplyr))

if(verbose){print("checking input data...")}

#how many samples do we have?
Expand Down Expand Up @@ -227,8 +229,9 @@ sciClone <- function(vafs, copyNumberCalls=NULL, regionsToExclude=NULL,
vafs.1d.merged.cn2 = cbind(vafs.merged.cn2.orig,cluster=marginalClust[[i]]$cluster.assignments)
vafs.1d.merged = merge(vafs.merged.orig,vafs.1d.merged.cn2, by.x=c(1:length(vafs.merged.orig)),
by.y=c(1:length(vafs.merged.orig)),all.x=TRUE)

##sort by chr, st
vafs.1d.merged = vafs.1d.merged[order(vafs.1d.merged[,1,drop=FALSE], vafs.1d.merged[,2,drop=FALSE]),]
vafs.1d.merged = dplyr::arrange(vafs.1d.merged, chr, st)
vafs.1d[[i]] = vafs.1d.merged
}
}
Expand Down

0 comments on commit 795d2da

Please sign in to comment.