diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyMetricsWalker.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyMetricsWalker.java index 5ef12ef87..057d19fa3 100755 --- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyMetricsWalker.java +++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyMetricsWalker.java @@ -172,13 +172,8 @@ public class AlleleFrequencyMetricsWalker extends LocusWalker= 5) || (alleleFreq.lodVsRef <= -5)) { System.out.print(alleleFreq.asTabularString()); } - //out.print(alleleFreq.asTabularString()); if ((alleleFreq.lodVsRef >= 5) || (alleleFreq.lodVsRef <= -5)) { System.out.print(alleleFreq.asGFFString()); } - if (this.num_loci_total % 1000 == 0) { printMetrics(); } - return "null"; } diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyWalker.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyWalker.java index 26e5c93cc..f55d0a4a3 100755 --- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyWalker.java +++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyWalker.java @@ -5,16 +5,23 @@ import org.broadinstitute.sting.gatk.refdata.ReferenceOrderedDatum; import org.broadinstitute.sting.gatk.refdata.rodDbSNP; import org.broadinstitute.sting.gatk.walkers.LocusWalker; import org.broadinstitute.sting.playground.utils.AlleleFrequencyEstimate; +import org.broadinstitute.sting.utils.cmdLine.Argument; import net.sf.samtools.SAMRecord; import java.util.List; import java.util.Arrays; +import java.util.Random; +import java.io.PrintStream; -public class AlleleFrequencyWalker extends LocusWalker { +public class AlleleFrequencyWalker extends LocusWalker +{ - int N=2; - int DOWNSAMPLE = 0; - java.util.Random random; + @Argument public int N; + @Argument public int DOWNSAMPLE; + @Argument public String GFF_OUTPUT_FILE; + + Random random; + PrintStream output; public AlleleFrequencyEstimate map(List rodData, char ref, LocusContext context) { @@ -347,14 +354,17 @@ public class AlleleFrequencyWalker extends LocusWalker= 5) || (alleleFreq.lodVsRef <= -5)) { System.out.print(alleleFreq.asGFFString()); } - return 0; + if ((alleleFreq.lodVsRef >= 5) || (alleleFreq.lodVsRef <= -5)) { this.output.print(alleleFreq.asGFFString()); } + return ""; } static int nuc2num[]; @@ -376,16 +386,37 @@ public class AlleleFrequencyWalker extends LocusWalker