use read.delim instead of read_tsv
Return empty GRangePairs when no CNE identified.
git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/CNEr@120860 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -46,7 +46,7 @@ importFrom(S4Vectors, .Call2, queryHits, subjectHits, DataFrame, |
46 | 46 |
isTRUEorFALSE, isSingleString, queryLength, subjectLength) |
47 | 47 |
importFrom(tools, file_ext) |
48 | 48 |
importFrom(parallel, mcmapply) |
49 |
-importFrom(utils, download.file, read.table, write.table) |
|
49 |
+importFrom(utils, download.file, read.table, write.table, read.delim) |
|
50 | 50 |
importFrom("stats", "setNames") |
51 | 51 |
importFrom(reshape2, melt) |
52 | 52 |
importFrom(ggplot2, ggplot, aes, aes_q, aes_string, geom_tile, theme_bw, |
... | ... |
@@ -23,7 +23,7 @@ readAncora <- function(fn, assembly=NULL, |
23 | 23 |
tAssemblyFn=NULL, qAssemblyFn=NULL){ |
24 | 24 |
assembly1 <- strsplit(basename(fn), split="_")[[1]][2] |
25 | 25 |
assembly2 <- strsplit(basename(fn), split="_")[[1]][3] |
26 |
- cne <- suppressMessages(read_tsv(fn, col_names=FALSE)) |
|
26 |
+ cne <- read.delim(fn, header=FALSE) |
|
27 | 27 |
|
28 | 28 |
# Prepare the seqinfo when available |
29 | 29 |
seqinfoTarget <- NULL |
... | ... |
@@ -35,21 +35,21 @@ readAncora <- function(fn, assembly=NULL, |
35 | 35 |
seqinfoQuery <- seqinfoFn(qAssemblyFn) |
36 | 36 |
} |
37 | 37 |
|
38 |
- ans <- GRangePairs(first=GRanges(seqnames=cne$X1, |
|
39 |
- ranges=IRanges(start=cne$X2+1, |
|
40 |
- end=cne$X3), |
|
38 |
+ ans <- GRangePairs(first=GRanges(seqnames=cne[[1]], |
|
39 |
+ ranges=IRanges(start=cne[[2]]+1, |
|
40 |
+ end=cne[[3]]), |
|
41 | 41 |
strand="*", |
42 |
- name=paste0(cne$X4, ":", |
|
43 |
- (cne$X5+1), "-", cne$X6), |
|
44 |
- itemRgb=chr2colour(cne$X4), |
|
42 |
+ name=paste0(cne[[4]], ":", |
|
43 |
+ (cne[[5]]+1), "-", cne[[6]]), |
|
44 |
+ itemRgb=chr2colour(cne[[4]]), |
|
45 | 45 |
seqinfo=seqinfoTarget), |
46 |
- second=GRanges(seqnames=cne$X4, |
|
47 |
- ranges=IRanges(start=cne$X5+1, |
|
48 |
- end=cne$X6), |
|
46 |
+ second=GRanges(seqnames=cne[[4]], |
|
47 |
+ ranges=IRanges(start=cne[[5]]+1, |
|
48 |
+ end=cne[[6]]), |
|
49 | 49 |
strand="*", |
50 |
- name=paste0(cne$X1, ":", |
|
51 |
- (cne$X2+1), "-", cne$X3), |
|
52 |
- itemRgb=chr2colour(cne$X1), |
|
50 |
+ name=paste0(cne[[1]], ":", |
|
51 |
+ (cne[[2]]+1), "-", cne[[3]]), |
|
52 |
+ itemRgb=chr2colour(cne[[1]]), |
|
53 | 53 |
seqinfo=seqinfoQuery) |
54 | 54 |
) |
55 | 55 |
if(is.null(assembly)){ |
... | ... |
@@ -73,7 +73,13 @@ ceScanR <- function(axts, tFilter=NULL, qFilter=NULL, tSizes, qSizes, |
73 | 73 |
} |
74 | 74 |
CNE <- lapply(resFiles, |
75 | 75 |
function(x){ |
76 |
- res <- read.table(x, header=FALSE, sep="\t", as.is=TRUE) |
|
76 |
+ res <- try(read.table(x, header=FALSE, sep="\t", as.is=TRUE), |
|
77 |
+ silent=TRUE) |
|
78 |
+ if(class(res) == "try-error"){ |
|
79 |
+ return(GRangePairs(first=GRanges(seqinfo=tSizes), |
|
80 |
+ second=GRanges(seqinfo=qSizes)) |
|
81 |
+ ) |
|
82 |
+ } |
|
77 | 83 |
colnames(res) <- c("tName", "tStart", "tEnd", |
78 | 84 |
"qName", "qStart", "qEnd", |
79 | 85 |
"strand", "score", "cigar") |