diff --git a/R/plot_Tranches.R b/R/plot_Tranches.R index 075375340..0b0152de3 100755 --- a/R/plot_Tranches.R +++ b/R/plot_Tranches.R @@ -52,7 +52,7 @@ alpha = 1 - titvFPEstV(targetTITV, novelTiTv) numGood = round(alpha * data2$numNovel); -#numGood = round(data2$numNovel * (1-data2$FDRtranche/100)) +#numGood = round(data2$numNovel * (1-data2$targetTruthSensitivity/100)) numBad = data2$numNovel - numGood; numPrevGood = leftShift(numGood, 0) @@ -66,12 +66,12 @@ barplot(d/1000,horiz=TRUE,col=cols,space=0.2,xlab="Number of Novel Variants (100 #abline(v= d[2,dim(d)[2]], lty=2) #abline(v= d[1,3], lty=2) if ( ! suppressLegend ) - legend(5, 1.75, c('Cumulative TPs','Tranch-specific TPs', 'Tranch-specific FPs', 'Cumulative FPs' ), fill=cols, density=density, bg='white', cex=1.25) + legend(5, length(data2$targetTruthSensitivity)-1.25, c('Cumulative TPs','Tranch-specific TPs', 'Tranch-specific FPs', 'Cumulative FPs' ), fill=cols, density=density, bg='white', cex=1.25) -mtext("Ti/Tv",2,line=2.25,at=length(data2$FDRtranche)*1.2,las=1, cex=1) -mtext("FNR",2,line=0,at=length(data2$FDRtranche)*1.2,las=1, cex=1) -axis(2,line=-1,at=0.7+(0:(length(data2$FDRtranche)-1))*1.2,tick=FALSE,labels=data2$FDRtranche, las=1, cex.axis=1.0) -axis(2,line=1,at=0.7+(0:(length(data2$FDRtranche)-1))*1.2,tick=FALSE,labels=round(novelTiTv,3), las=1, cex.axis=1.0) +mtext("Ti/Tv",2,line=2.25,at=length(data2$targetTruthSensitivity)*1.2,las=1, cex=1) +mtext("truth",2,line=0,at=length(data2$targetTruthSensitivity)*1.2,las=1, cex=1) +axis(2,line=-1,at=0.7+(0:(length(data2$targetTruthSensitivity)-1))*1.2,tick=FALSE,labels=data2$targetTruthSensitivity, las=1, cex.axis=1.0) +axis(2,line=1,at=0.7+(0:(length(data2$targetTruthSensitivity)-1))*1.2,tick=FALSE,labels=round(novelTiTv,3), las=1, cex.axis=1.0) # plot sensitivity vs. specificity sensitivity = data2$truthSensitivity diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/variantrecalibration/VariantRecalibrator.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/variantrecalibration/VariantRecalibrator.java index 4250866f1..631453656 100755 --- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/variantrecalibration/VariantRecalibrator.java +++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/variantrecalibration/VariantRecalibrator.java @@ -43,6 +43,7 @@ import org.broadinstitute.sting.utils.Utils; import org.broadinstitute.sting.utils.collections.ExpandingArrayList; import org.broadinstitute.sting.utils.exceptions.UserException; +import java.io.File; import java.io.FileNotFoundException; import java.io.PrintStream; import java.util.*; @@ -68,11 +69,13 @@ public class VariantRecalibrator extends RodWalker ignoreInputFilterSet = new TreeSet(); private final Set inputNames = new HashSet(); private final VariantRecalibratorEngine engine = new VariantRecalibratorEngine( VRAC ); @@ -136,6 +142,12 @@ public class VariantRecalibrator extends RodWalker tranches = TrancheManager.findTranches( dataManager.getData(), TS_TRANCHES, metric ); - TRANCHES_FILE.print(Tranche.tranchesString( tranches )); + tranchesStream.print(Tranche.tranchesString( tranches )); double lodCutoff = 0.0; for( final Tranche tranche : tranches ) { @@ -240,6 +252,20 @@ public class VariantRecalibrator extends RodWalker randomData, final GaussianMixtureModel goodModel, final GaussianMixtureModel badModel, final double lodCutoff ) {