Minor improvements to Callable Loci for public consumption

git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3408 348d0f76-0448-11de-a6fe-93d51630548a

java/src/org/broadinstitute/sting/gatk/walkers/coverage/CallableLociWalker.java

@@ -32,6 +32,12 @@ import org.broadinstitute.sting.utils.*;
 import org.broadinstitute.sting.utils.pileup.PileupElement;
 import org.broadinstitute.sting.commandline.Argument;
 
+import java.util.EnumMap;
+import java.util.Map;
+import java.io.File;
+import java.io.PrintStream;
+import java.io.FileNotFoundException;
+
 
 /**
  * Emits a data file containing information about callable, uncallable, poorly mapped, and other parts of the genome
@@ -40,7 +46,7 @@ import org.broadinstitute.sting.commandline.Argument;
  * @Date May 7, 2010
  */
 @By(DataSource.REFERENCE)
-public class CallableLociWalker extends LocusWalker<CallableLociWalker.CallableBaseState, CallableLociWalker.CallableBaseState> {
+public class CallableLociWalker extends LocusWalker<CallableLociWalker.CallableBaseState, CallableLociWalker.Integrator> {
     @Argument(fullName = "maxLowMAPQ", shortName = "mlmq", doc = "Maximum value for MAPQ to be considered a problematic mapped read.  The gap between this value and mmq are reads that are not sufficiently well mapped for calling but aren't indicative of mapping problems.", required = false)
     byte maxLowMAPQ = 1;
 
@@ -65,6 +71,9 @@ public class CallableLociWalker extends LocusWalker<CallableLociWalker.CallableB
     @Argument(fullName = "format", shortName = "format", doc = "Output format for the system: either BED or STATE_PER_BASE", required = false)
     OutputFormat outputFormat;
 
+    @Argument(fullName = "summary", shortName = "summary", doc = "Name of file for output summary", required = true)
+    File summaryFile;
+
     public enum OutputFormat { BED, STATE_PER_BASE }
 
     ////////////////////////////////////////////////////////////////////////////////////
@@ -74,11 +83,18 @@ public class CallableLociWalker extends LocusWalker<CallableLociWalker.CallableB
     public boolean includeReadsWithDeletionAtLoci() { return true; }
 
     public void initialize() {
+        try {
+            PrintStream summaryOut = new PrintStream(summaryFile);
+            summaryOut.close();
+        } catch (FileNotFoundException e) {
+            throw new StingException("Cannot write to summary file " + summaryFile);
+        }
     }
 
-//    public boolean isReduceByInterval() {
+    public class Integrator {
-//        return false;
+        long counts[] = new long[CalledState.values().length];
-//    }
+        CallableBaseState state = null;
+    }
 
     public static class CallableBaseState {
         public GenomeLoc loc;
@@ -118,8 +134,8 @@ public class CallableLociWalker extends LocusWalker<CallableLociWalker.CallableB
 
     public enum CalledState { REF_N, CALLABLE, NO_COVERAGE, LOW_COVERAGE, EXCESSIVE_COVERAGE, POOR_MAPPING_QUALITY }
 
-    public CallableBaseState reduceInit() {
+    public Integrator reduceInit() {
-        return null;
+        return new Integrator();
     }
 
     public CallableBaseState map(RefMetaDataTracker tracker, ReferenceContext ref, AlignmentContext context) {
@@ -158,19 +174,22 @@ public class CallableLociWalker extends LocusWalker<CallableLociWalker.CallableB
         return new CallableBaseState(context.getLocation(), state);
     }
 
-    public CallableBaseState reduce(CallableBaseState state, CallableBaseState integrator) {
+    public Integrator reduce(CallableBaseState state, Integrator integrator) {
+        // update counts
+        integrator.counts[state.getState().ordinal()]++;
+
         if ( outputFormat == OutputFormat.STATE_PER_BASE ) {
             out.println(state.toString());
         } else {
             // format is integrating
-            if ( integrator == null ) {
+            if ( integrator.state == null )
-                integrator = state;
+                integrator.state = state;
-            } else if ( state.getLocation().getStart() != integrator.getLocation().getStop() + 1 ||
+            else if ( state.getLocation().getStart() != integrator.state.getLocation().getStop() + 1 ||
-                    integrator.changingState(state.getState()) ) {
+                    integrator.state.changingState(state.getState()) ) {
-                out.println(integrator.toString());
+                out.println(integrator.state.toString());
-                integrator = state;
+                integrator.state = state;
             } else {
-                integrator.update(state.getLocation());
+                integrator.state.update(state.getLocation());
             }
         }
 
@@ -182,9 +201,22 @@ public class CallableLociWalker extends LocusWalker<CallableLociWalker.CallableB
     // INTERVAL ON TRAVERSAL DONE
     ////////////////////////////////////////////////////////////////////////////////////
 
-    public void onTraversalDone(CallableBaseState result) {
+    public void onTraversalDone(Integrator result) {
         // print out the last state
-        if ( result!= null )
+        if ( result != null ) {
-            out.println(result.toString());
+            out.println(result.state.toString());
+
+            try {
+                PrintStream summaryOut = new PrintStream(summaryFile);
+                summaryOut.printf("%30s %s%n", "state", "nBases");
+                for ( CalledState state : CalledState.values() ) {
+                    summaryOut.printf("%30s %d%n", state, result.counts[state.ordinal()]);
+                }
+
+                summaryOut.close();
+            } catch (FileNotFoundException e) {
+                throw new StingException(e.getMessage());
+            }
+        }
     }
 }

java/test/org/broadinstitute/sting/gatk/walkers/coverage/CallableLociWalkerIntegrationTest.java

@@ -34,22 +34,25 @@ public class CallableLociWalkerIntegrationTest extends WalkerTest {
 
     @Test
     public void testCallableLociWalker1() {
-        String gatk_args = commonArgs + " -format BED -L 1:10,000,000-11,000,000";
+        String gatk_args = commonArgs + " -format BED -L 1:10,000,000-11,000,000 -summary %s";
-        WalkerTestSpec spec = new WalkerTestSpec(gatk_args, 1, Arrays.asList("b3a273984da6744d6de4ca0ab3eb759b"));
+        WalkerTestSpec spec = new WalkerTestSpec(gatk_args, 2,
+                Arrays.asList("b3a273984da6744d6de4ca0ab3eb759b", "33b8b285a738d8d5daf6e98af698a4eb"));
         executeTest("formatBed", spec);
     }
 
     @Test
     public void testCallableLociWalker2() {
-        String gatk_args = commonArgs + " -format BED -L 1:10,000,000-10,000,100;1:10,000,110-10,000,120";
+        String gatk_args = commonArgs + " -format BED -L 1:10,000,000-10,000,100;1:10,000,110-10,000,120 -summary %s";
-        WalkerTestSpec spec = new WalkerTestSpec(gatk_args, 1, Arrays.asList("c671f65712d9575b8b3e1f1dbedc146e"));
+        WalkerTestSpec spec = new WalkerTestSpec(gatk_args, 2,
+                Arrays.asList("c671f65712d9575b8b3e1f1dbedc146e", "d287510eac04acf5a56f5cde2cba0e4a"));
         executeTest("formatBed by interval", spec);
     }
 
     @Test
     public void testCallableLociWalker3() {
-        String gatk_args = commonArgs + " -format BED -L 1:10,000,000-11,000,000 -minDepth 10 -maxDepth 100 --minBaseQuality 10 --minMappingQuality 20";
+        String gatk_args = commonArgs + " -format BED -L 1:10,000,000-11,000,000 -minDepth 10 -maxDepth 100 --minBaseQuality 10 --minMappingQuality 20 -summary %s";
-        WalkerTestSpec spec = new WalkerTestSpec(gatk_args, 1, Arrays.asList("3fee7d7d0e305f439db29b4e641d1c20"));
+        WalkerTestSpec spec = new WalkerTestSpec(gatk_args, 2,
+                Arrays.asList("3fee7d7d0e305f439db29b4e641d1c20", "99c54acdad7e81ccf219b8a70cd26917"));
         executeTest("formatBed lots of arguments", spec);
     }
 }