diff --git a/R/JaBbA.R b/R/JaBbA.R index 38d103b..b08f6b9 100755 --- a/R/JaBbA.R +++ b/R/JaBbA.R @@ -3211,8 +3211,6 @@ jbaLP = function(kag.file = NULL, kag.gg$edges$mark(cn = NULL) kag.gg$nodes[cn > M]$mark(cn = NA, weight = NA) - ## browser() - ## add lower bounds depending on ALT junction tier if (tfield %in% colnames(kag.gg$edges$dt)) { lbs = ifelse(kag.gg$edges$dt[, ..tfield] == 1, 1, 0) @@ -6722,14 +6720,14 @@ read.junctions = function(rafile, , tier := ifelse( tier==2, ifelse(grepl("1", this.geno), 2, 3), 3)] values(this.ra) = this.dt - return(this.ra) + return(verify.junctions(this.ra)) }) loose=FALSE ## TODO: temporary until we figure out how } } if (!get.loose | is.null(vgr$mix)){ - return(ra) + return(verify.junctions(ra)) } else { npix = is.na(vgr$mix) ## these are possible "loose ends" that we will add to the segmentation @@ -6744,7 +6742,7 @@ read.junctions = function(rafile, values(vgr.loose) = cbind(vcf@fixed[bix[npix], ], info(vcf)[bix[npix], ]) } - return(list(junctions = ra, loose.ends = vgr.loose)) + return(list(junctions = verify.junctions(ra), loose.ends = vgr.loose)) } } else{ rafile = data.table::fread(rafile) diff --git a/tests/testthat/test_filterloose.R b/tests/testthat/test_filterloose.R index c6b8328..c7cd5f0 100644 --- a/tests/testthat/test_filterloose.R +++ b/tests/testthat/test_filterloose.R @@ -17,6 +17,7 @@ test_that(desc = "Testing LP JaBbA with .bw coverage input", slack.penalty = 10, tilim = 60, cfield = 'ratio', + reiterate = 2, verbose = 2, outdir = 'JaBbA.filter', overwrite = TRUE, @@ -61,7 +62,7 @@ test_that(desc = "Testing LP JaBbA with .bw coverage input", rescue.all = FALSE, filter_loose = FALSE)) }, - regexp = "Resetting rescue.all to TRUE") + regexp = "Skipping loose end annotation") }) test_that(desc = "Testing LP JaBbA with .bw coverage input",