Skip to content

Commit e5f649b

Browse files
committed
Included datasets (rda) from the "chromosomes" package to avoid this dependency
1 parent d795591 commit e5f649b

18 files changed

+21
-9
lines changed

DESCRIPTION

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Date: 2018-10-30
77
Author: Bastien Job
88
Maintainer: Bastien JOB <[email protected]>
99
Depends: R(>= 3.1.0)
10-
Imports: affxparser, ASCAT, Biostrings, aroma.light, BSgenome, changepoint, chromosomes, copynumber, data.table, doParallel, dplyr, DT, facets, foreach, GenomeInfoDb, GenomicRanges, iotools, IRanges, limma, mclust, parallel, rhdf5, R.utils, seqinr, sequenza
10+
Imports: affxparser, ASCAT, Biostrings, aroma.light, BSgenome, changepoint, copynumber, data.table, doParallel, dplyr, DT, facets, foreach, GenomeInfoDb, GenomicRanges, iotools, IRanges, limma, mclust, parallel, rhdf5, R.utils, seqinr, sequenza
1111
Suggests: BSgenome.Hsapiens.UCSC.hg18, BSgenome.Hsapiens.UCSC.hg19, BSgenome.Hsapiens.UCSC.hg38, Rsamtools, affy.CN.norm.data, apt.cytoscan.2.4.0, apt.oncoscan.2.4.0, apt.snp6.1.20.0, knitr, rcnorm, rmarkdown
1212
Description: Easy copy-number analysis for Affymetrix microarrays (snp6.0, CytoScanHD, CytoScan750K & OncoScan) and whole exome sequencing data.
1313
License: MIT + file LICENSE

NAMESPACE

-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import(chromosomes)
21
import(mclust)
32
importFrom("affxparser", "readCel", "readCelHeader")
43
importFrom("aroma.light", "normalizeTumorBoost")
@@ -11,7 +10,6 @@ importFrom("data.table", "fread")
1110
importFrom("doParallel", "registerDoParallel")
1211
importFrom("dplyr", "as.tbl", "group_by", "summarize", "left_join")
1312
importFrom("DT", "datatable", "formatCurrency", "formatStyle", "formatRound", "styleEqual")
14-
# importFrom("facets", "emcncf", "scanSnp", "segsnps")
1513
importFrom("foreach", "foreach", "%do%", "%dopar%")
1614
importFrom("GenomeInfoDb", "seqlengths")
1715
importFrom("GenomicRanges", "GRanges", "reduce", "sort", "duplicated", "width", "makeGRangesFromDataFrame", "findOverlaps", "trim")
@@ -25,7 +23,6 @@ importFrom("parallel", "makeCluster", "stopCluster", "detectCores")
2523
importFrom("R.utils", "gunzip", "bunzip2")
2624
importFrom("rhdf5", "h5read")
2725
importFrom("seqinr", "GC")
28-
# importFrom("sequenza", "baf.bayes", "baf.model.fit", "get.ci")
2926
importFrom("stats", "approxfun", "density", "end", "mad", "median", "quantile", "runmed", "setNames", "start")
3027
importFrom("tools", "file_path_as_absolute", "file_ext")
3128
importFrom("utils", "data", "read.table", "write.table", "count.fields", "installed.packages", "unzip", "head", "tail")

R/EaCoN_functions.R

+3-2
Original file line numberDiff line numberDiff line change
@@ -2034,7 +2034,7 @@ Annotate <- function(data = NULL, refGene.table = NULL, targets.table = NULL, re
20342034
if (genome %in% names(valid.genomes)) {
20352035
self.pkg.name <- "EaCoN"
20362036
data(list = paste0("refGene_cl_", genome), package = self.pkg.name, envir = environment())
2037-
data(list = genome, package = "chromosomes", envir = environment())
2037+
data(list = genome, package = self.pkg.name, envir = environment())
20382038
} else {
20392039
## ... and none in bank : no genes !
20402040
tmsg("WARNING : No refGene table provided, and none banked for current genome : Gene information won't exist in the report!")
@@ -2601,7 +2601,8 @@ Annotate.solo <- function(cbs.file = NULL, genome = NULL, ldb = "/mnt/data_cigog
26012601
# if (length(cbs.cut.file) > 1) stop(paste0("Found multiple Cut CBS files for ", sample.dir))
26022602
if (!file.exists(cbs.file)) stop(tmsg(paste0("Could not find CBS file [", cbs.file, "] !")))
26032603
cbs.df <- read.table.fast(cbs.file)
2604-
data(list = genome, package = "chromosomes", envir = environment())
2604+
self.pkg.name <- "EaCoN"
2605+
data(list = genome, package = self.pkg.name, envir = environment())
26052606
## Converting CBS to SOLO
26062607
message(tmsg(" Converting to SOLO ..."))
26072608
solo.df <- data.frame(Loc = paste0(unlist(cs$chr2chrom[cbs.df$Chr]), ":", cbs.df$Start, "-", cbs.df$End), Probes = cbs.df$Probes, Status = sign(cbs.df$Log2Ratio), L2R = cbs.df$Log2Ratio, Ratio = 2^cbs.df$Log2Ratio, stringsAsFactors = FALSE)

R/plot_functions.R

+4-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ EaCoN.l2rplot.karyo <- function(l2r = NULL, seg = NULL, seg.col = list(gain = "b
9797
genome <- BSgenome::providerVersion(BSg.obj)
9898
# cs <- chromobjector(BSg.obj)
9999

100-
data(list = genome, package = "chromosomes", envir = environment())
100+
self.pkg.name <- "EaCoN"
101+
data(list = genome, package = self.pkg.name, envir = environment())
101102
l2r <- l2r[!is.na(l2r$Value),]
102103

103104
par(mgp=c(0,0,0), omi=c(0,0.2,0.1,0), xaxt="n", yaxt="n", bty="n")
@@ -155,7 +156,8 @@ EaCoN.l2rplot.chromo <- function(chr = NULL, l2r = NULL, l2r.seg = NULL, baf = N
155156
genome <- BSgenome::providerVersion(BSg.obj)
156157
# cs <- chromobjector(BSg.obj)
157158

158-
data(list = genome, package = "chromosomes", envir = environment())
159+
self.pkg.name <- "EaCoN"
160+
data(list = genome, package = self.pkg.name, envir = environment())
159161

160162
l2r <- l2r[!is.na(l2r$Value),]
161163
kLprob.idx <- which(l2r$Chr == chr)

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ It consists in a series of R packages that perform such type of analysis, from r
2323
- Small code changes to adapt to "non-completely covered" genomes (ie, few chromosomes for toy datasets, by example).
2424
- Harmonized the penalty parameter for all segmenters (now just "penalty" rather than "ASCAT.pen", "SEQUENZA.pen" or "FACETS.pen")
2525
- Officially dropping support for sequenza with SNP6 arrays as it leads to a huge RAM consumption by copynumber::aspcf, due to the few probes covering both L2R and BAF.
26+
- Included chromosomes objects in package for hs, mm and rn, to avaoid dependency to another non-public sourceable package.
2627

2728
### **2018-10-02 : v0.3.3-1 _(LittleWomanNoCry)_ is out !**
2829

@@ -124,7 +125,6 @@ While the current EaCoN package is the core of the process, multiple others are
124125
- GC% & wave-effect normalization :
125126
- [affy.CN.norm.data](http://bit.ly/AffyCNnorm) _Pre-computed tracks for all supported Affmetrix designs (both hg19 and hg38)_
126127
- [rcnorm](http://bit.ly/rcnorm) _Code and tracks to re-normalize BAF for the CytoScan family of designs and SNP6, using *rawcopy*_
127-
- [chromosomes](http://bit.ly/chromosomespackage) _to provide the structure of chromsomes for homo sapiens (hg17 to hg38, hs37d5), mus musculus (mm7 to mm10) and rattus norvegicus (rn5 to rn6)_
128128
- Raw data :
129129
- For Affymetrix microarrays : the **CEL** files, fresh out of the Affymetrix Scanner
130130
- For WES data :

data/GRCh37-lite.rda

13.6 KB
Binary file not shown.

data/datalist

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
11
refGene_cl_hg19: gen.df
22
targetlist_270: targetlist
33
targetlist_475: targetlist
4+
hg17: homo_sapiens_build_17
5+
hg18: homo_sapiens_build_18
6+
hg19: homo_sapiens_build_19
7+
GRCh37-lite: homo_sapiens_build_19_TCGA
8+
hs37d5: homo_sapiens_build_19_1000Genomes
9+
hg38: homo_sapiens_build_38
10+
mm7: mus_musculus_build_7
11+
mm8: mus_musculus_build_8
12+
mm9: mus_musculus_build_9
13+
mm10: mus_musculus_build_10
14+
rn5: rattus_norvegicus_build_5
15+
rn6: rattus_norvegicus_build_6

data/hg17.rda

9.18 KB
Binary file not shown.

data/hg18.rda

9.14 KB
Binary file not shown.

data/hg19.rda

9.24 KB
Binary file not shown.

data/hg38.rda

8.66 KB
Binary file not shown.

data/hs37d5.rda

9.18 KB
Binary file not shown.

data/mm10.rda

5.52 KB
Binary file not shown.

data/mm7.rda

5.57 KB
Binary file not shown.

data/mm8.rda

5.43 KB
Binary file not shown.

data/mm9.rda

5.45 KB
Binary file not shown.

data/rn5.rda

3.85 KB
Binary file not shown.

data/rn6.rda

1.22 KB
Binary file not shown.

0 commit comments

Comments
 (0)