diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/phasing/ReadBackedPhasingWalker.java b/java/src/org/broadinstitute/sting/gatk/walkers/phasing/ReadBackedPhasingWalker.java index bf8e7027e..f89a560cc 100755 --- a/java/src/org/broadinstitute/sting/gatk/walkers/phasing/ReadBackedPhasingWalker.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/phasing/ReadBackedPhasingWalker.java @@ -76,6 +76,12 @@ public class ReadBackedPhasingWalker extends RodWalker unphasedSiteQueue = null; private DoublyLinkedList partiallyPhasedSites = null; // the phased VCs to be emitted, and the alignment bases at these positions @@ -323,8 +329,14 @@ public class ReadBackedPhasingWalker extends RodWalker sampPhaseCountEntry : result.getPhaseCounts()) { PhaseCounts pc = sampPhaseCountEntry.getValue(); - System.out.println("Sample: " + sampPhaseCountEntry.getKey() + "\tNumber of tested sites [cacheWindow= " + cacheWindow + "]: " + pc.numTestedSites + "\tNumber of phased sites: " + pc.numPhased + "\tNumber of phase-inconsistent sites: " + pc.numInconsistentSites); + System.out.print("Sample: " + sampPhaseCountEntry.getKey() + "\tSites tested: " + pc.numTestedSites + "\tSites phased: " + pc.numPhased); + System.out.println("\tPhase-inconsistent sites: " + (pc.numInconsistentSitesPhased + pc.numInconsistentSitesNotPhased) + " [phased: " + pc.numInconsistentSitesPhased + ", unphased:" + pc.numInconsistentSitesNotPhased + "]"); } System.out.println(""); } protected void writeVarContList(List varContList) { - for (VariantContext vc : varContList) { + for (VariantContext vc : varContList) writeVCF(vc); - } } /* Inner classes: */ - private static class VariantAndReads { + private class VariantAndReads { public VariantContext variant; public HashMap sampleReadBases; public boolean processVariant; @@ -976,14 +988,18 @@ public class ReadBackedPhasingWalker extends RodWalker= 10", spec); } @@ -35,7 +35,7 @@ public class ReadBackedPhasingIntegrationTest extends WalkerTest { baseTestString(hg18Reference, "phasing_test_chr20_332341_1332503.bam", "phasing_test_chr20_332341_1332503.vcf", 20000, 10, 10) + " -L chr20:1232503-1332503", 1, - Arrays.asList("9a8f9beb94b204332d0a32a3af0d4118")); + Arrays.asList("d9cf20f506f2d0aa196fa89c051532c6")); executeTest("MAX 10 het sites [TEST TWO]; require PQ >= 10", spec); } @@ -45,7 +45,7 @@ public class ReadBackedPhasingIntegrationTest extends WalkerTest { baseTestString(hg18Reference, "phasing_test_chr20_332341_1332503.bam", "phasing_test_chr20_332341_1332503.vcf", 20000, 2, 30) + " -L chr20:332341-382503", 1, - Arrays.asList("3d2973ca1f6d26062fa7f0d795faa216")); + Arrays.asList("e3ea64260f517830633b0060b3594178")); executeTest("MAX 2 het sites [TEST THREE]; require PQ >= 30", spec); } @@ -55,7 +55,7 @@ public class ReadBackedPhasingIntegrationTest extends WalkerTest { baseTestString(hg18Reference, "phasing_test_chr20_332341_1332503.bam", "phasing_test_chr20_332341_1332503.vcf", 20000, 5, 100) + " -L chr20:332341-382503", 1, - Arrays.asList("13c66ff8448a8c3b1e3db4f7881f871d")); + Arrays.asList("435825a2a034ca27047fbd8a1dc1e0b2")); executeTest("MAX 5 het sites [TEST FOUR]; require PQ >= 100", spec); } @@ -65,7 +65,7 @@ public class ReadBackedPhasingIntegrationTest extends WalkerTest { baseTestString(hg18Reference, "phasing_test_chr20_332341_1332503.bam", "phasing_test_chr20_332341_1332503.vcf", 1000, 7, 10) + " -L chr20:332341-482503", 1, - Arrays.asList("3d35745e1cf40c892a8e793b141dbf20")); + Arrays.asList("d5897638dd317c3347b15ef05a13e53a")); executeTest("MAX 7 het sites [TEST FIVE]; require PQ >= 10; cacheWindow = 1000", spec); }