diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/validation/GenotypeAndValidateWalker.java b/public/java/src/org/broadinstitute/sting/gatk/walkers/validation/GenotypeAndValidateWalker.java index f416e94a0..c2f6e2099 100755 --- a/public/java/src/org/broadinstitute/sting/gatk/walkers/validation/GenotypeAndValidateWalker.java +++ b/public/java/src/org/broadinstitute/sting/gatk/walkers/validation/GenotypeAndValidateWalker.java @@ -39,7 +39,6 @@ import org.broadinstitute.sting.utils.codecs.vcf.VCFHeader; import org.broadinstitute.sting.utils.codecs.vcf.VCFHeaderLine; import org.broadinstitute.sting.utils.codecs.vcf.VCFUtils; import org.broadinstitute.sting.utils.codecs.vcf.VCFWriter; -import org.broadinstitute.sting.utils.exceptions.UserException; import org.broadinstitute.sting.utils.variantcontext.MutableVariantContext; import org.broadinstitute.sting.utils.variantcontext.VariantContext; import org.broadinstitute.sting.utils.variantcontext.VariantContextUtils; @@ -266,8 +265,13 @@ public class GenotypeAndValidateWalker extends RodWalker 0 && context.getBasePileup().getBases().length < minDepth)) { counter.nUncovered = 1L; + if (vcComp.getAttribute("GV").equals("T")) + counter.nAltNotCalled = 1L; + else if (vcComp.getAttribute("GV").equals("F")) + counter.nRefNotCalled = 1L; + else + counter.nNoStatusNotCalled = 1L; + return counter; } @@ -382,7 +398,7 @@ public class GenotypeAndValidateWalker extends RodWalker 0) ? 100 * ((double) reduceSum.nRefCalledRef /( reduceSum.nRefCalledRef + reduceSum.nRefCalledAlt)) : 100; logger.info(String.format("Resulting Truth Table Output\n\n" + - "---------------------------------------------------\n" + - "\t\t|\tALT\t|\tREF\t\n" + - "---------------------------------------------------\n" + - "called alt\t|\t%d\t|\t%d\n" + - "called ref\t|\t%d\t|\t%d\n" + - "---------------------------------------------------\n" + + "------------------------------------------------------------------\n" + + "\t\t|\tALT\t|\tREF\t|\tNo Status\n" + + "------------------------------------------------------------------\n" + + "called alt\t|\t%d\t|\t%d\t|\t%d\n" + + "called ref\t|\t%d\t|\t%d\t|\t%d\n" + + "not called\t|\t%d\t|\t%d\t|\t%d\n" + + "------------------------------------------------------------------\n" + "positive predictive value: %f%%\n" + "negative predictive value: %f%%\n" + - "---------------------------------------------------\n" + + "------------------------------------------------------------------\n" + "sensitivity: %f%%\n" + "specificity: %f%%\n" + - "---------------------------------------------------\n" + + "------------------------------------------------------------------\n" + "not confident: %d\n" + "not covered: %d\n" + - "---------------------------------------------------\n", reduceSum.nAltCalledAlt, reduceSum.nRefCalledAlt, reduceSum.nAltCalledRef, reduceSum.nRefCalledRef, ppv, npv, sensitivity, specificity, reduceSum.nNotConfidentCalls, reduceSum.nUncovered)); + "------------------------------------------------------------------\n", reduceSum.nAltCalledAlt, reduceSum.nRefCalledAlt, reduceSum.nNoStatusCalledAlt, reduceSum.nAltCalledRef, reduceSum.nRefCalledRef, reduceSum.nNoStatusCalledRef, reduceSum.nAltNotCalled, reduceSum.nRefNotCalled, reduceSum.nNoStatusNotCalled, ppv, npv, sensitivity, specificity, reduceSum.nNotConfidentCalls, reduceSum.nUncovered)); } }