headerLines ) { }
}
\ No newline at end of file
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/BeagleOutputToVCFWalker.java b/public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/BeagleOutputToVCF.java
similarity index 99%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/BeagleOutputToVCFWalker.java
rename to public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/BeagleOutputToVCF.java
index 31006f4d8..627d561f6 100755
--- a/public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/BeagleOutputToVCFWalker.java
+++ b/public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/BeagleOutputToVCF.java
@@ -31,13 +31,13 @@ import org.broadinstitute.sting.gatk.contexts.AlignmentContext;
import org.broadinstitute.sting.gatk.contexts.ReferenceContext;
import org.broadinstitute.sting.gatk.datasources.rmd.ReferenceOrderedDataSource;
import org.broadinstitute.sting.gatk.refdata.RefMetaDataTracker;
-import org.broadinstitute.sting.utils.codecs.beagle.BeagleFeature;
import org.broadinstitute.sting.gatk.walkers.RodWalker;
import org.broadinstitute.sting.utils.GenomeLoc;
import org.broadinstitute.sting.utils.SampleUtils;
+import org.broadinstitute.sting.utils.codecs.beagle.BeagleFeature;
import org.broadinstitute.sting.utils.codecs.vcf.*;
-import org.broadinstitute.sting.utils.variantcontext.writer.VariantContextWriter;
import org.broadinstitute.sting.utils.variantcontext.*;
+import org.broadinstitute.sting.utils.variantcontext.writer.VariantContextWriter;
import java.util.*;
@@ -72,7 +72,7 @@ import static java.lang.Math.log10;
Note that Beagle produces some of these files compressed as .gz, so gunzip must be run on them before walker is run in order to decompress them
*/
-public class BeagleOutputToVCFWalker extends RodWalker {
+public class BeagleOutputToVCF extends RodWalker {
@ArgumentCollection
protected StandardVariantContextInputArgumentCollection variantCollection = new StandardVariantContextInputArgumentCollection();
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/ProduceBeagleInputWalker.java b/public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/ProduceBeagleInput.java
similarity index 98%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/ProduceBeagleInputWalker.java
rename to public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/ProduceBeagleInput.java
index a8e280f43..14e92a066 100755
--- a/public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/ProduceBeagleInputWalker.java
+++ b/public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/ProduceBeagleInput.java
@@ -37,10 +37,13 @@ import org.broadinstitute.sting.gatk.walkers.variantrecalibration.VQSRCalibratio
import org.broadinstitute.sting.utils.GenomeLoc;
import org.broadinstitute.sting.utils.MathUtils;
import org.broadinstitute.sting.utils.SampleUtils;
-import org.broadinstitute.sting.utils.codecs.vcf.*;
-import org.broadinstitute.sting.utils.variantcontext.writer.VariantContextWriter;
+import org.broadinstitute.sting.utils.codecs.vcf.VCFFilterHeaderLine;
+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.exceptions.StingException;
import org.broadinstitute.sting.utils.variantcontext.*;
+import org.broadinstitute.sting.utils.variantcontext.writer.VariantContextWriter;
import java.io.File;
import java.io.PrintStream;
@@ -72,7 +75,7 @@ import java.util.*;
*
*/
-public class ProduceBeagleInputWalker extends RodWalker {
+public class ProduceBeagleInput extends RodWalker {
@ArgumentCollection protected StandardVariantContextInputArgumentCollection variantCollection = new StandardVariantContextInputArgumentCollection();
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/VariantsToBeagleUnphasedWalker.java b/public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/VariantsToBeagleUnphased.java
similarity index 98%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/VariantsToBeagleUnphasedWalker.java
rename to public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/VariantsToBeagleUnphased.java
index d6b19b377..6d83a1d2a 100755
--- a/public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/VariantsToBeagleUnphasedWalker.java
+++ b/public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/VariantsToBeagleUnphased.java
@@ -38,12 +38,12 @@ import org.broadinstitute.sting.utils.SampleUtils;
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.variantcontext.writer.VariantContextWriter;
import org.broadinstitute.sting.utils.exceptions.UserException;
import org.broadinstitute.sting.utils.variantcontext.Allele;
import org.broadinstitute.sting.utils.variantcontext.Genotype;
import org.broadinstitute.sting.utils.variantcontext.VariantContext;
import org.broadinstitute.sting.utils.variantcontext.VariantContextUtils;
+import org.broadinstitute.sting.utils.variantcontext.writer.VariantContextWriter;
import java.io.PrintStream;
import java.util.Arrays;
@@ -54,7 +54,7 @@ import java.util.Set;
* in input variant file. Will additional hold back a fraction of the sites for evaluation, marking the
* genotypes at that sites as missing, and writing the truth of these sites to a second VCF file
*/
-public class VariantsToBeagleUnphasedWalker extends RodWalker {
+public class VariantsToBeagleUnphased extends RodWalker {
@Input(fullName="variants", shortName = "V", doc="Input VCF file", required=true)
public RodBinding variants;
@@ -104,7 +104,7 @@ public class VariantsToBeagleUnphasedWalker extends RodWalker
GenomeLoc loc = context.getLocation();
VariantContext vc = tracker.getFirstValue(variants, loc);
- if ( ProduceBeagleInputWalker.canBeOutputToBeagle(vc) ) {
+ if ( ProduceBeagleInput.canBeOutputToBeagle(vc) ) {
// do we want to hold back this site?
boolean makeMissing = dropSite(vc);
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/BaseQualityScoreRecalibrator.java b/public/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/BQSR.java
similarity index 99%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/BaseQualityScoreRecalibrator.java
rename to public/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/BQSR.java
index 8210a11b7..1a03ce1ce 100755
--- a/public/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/BaseQualityScoreRecalibrator.java
+++ b/public/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/BQSR.java
@@ -47,7 +47,7 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.PrintStream;
import java.lang.reflect.Constructor;
-import java.util.*;
+import java.util.ArrayList;
/**
* First pass of the base quality score recalibration -- Generates recalibration table based on various user-specified covariates (such as reported quality score, cycle, and dinucleotide).
@@ -106,7 +106,7 @@ import java.util.*;
@Requires({DataSource.READS, DataSource.REFERENCE, DataSource.REFERENCE_BASES}) // filter out all reads with zero or unavailable mapping quality
@PartitionBy(PartitionType.LOCUS) // this walker requires both -I input.bam and -R reference.fasta
-public class BaseQualityScoreRecalibrator extends LocusWalker implements TreeReducible {
+public class BQSR extends LocusWalker implements TreeReducible {
@ArgumentCollection
private final RecalibrationArgumentCollection RAC = new RecalibrationArgumentCollection(); // all the command line arguments for BQSR and it's covariates
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/StandardRecalibrationEngine.java b/public/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/StandardRecalibrationEngine.java
index 34d99c018..55c04f1b7 100644
--- a/public/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/StandardRecalibrationEngine.java
+++ b/public/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/StandardRecalibrationEngine.java
@@ -105,6 +105,6 @@ public class StandardRecalibrationEngine implements RecalibrationEngine, PublicP
* @return the covariate keysets for this read
*/
protected ReadCovariates covariateKeySetFrom(GATKSAMRecord read) {
- return (ReadCovariates) read.getTemporaryAttribute(BaseQualityScoreRecalibrator.COVARS_ATTRIBUTE);
+ return (ReadCovariates) read.getTemporaryAttribute(BQSR.COVARS_ATTRIBUTE);
}
}
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CallableLociWalker.java b/public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CallableLoci.java
similarity index 99%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CallableLociWalker.java
rename to public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CallableLoci.java
index 2a8940de0..bc791a5a4 100755
--- a/public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CallableLociWalker.java
+++ b/public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CallableLoci.java
@@ -120,7 +120,7 @@ import java.io.PrintStream;
* @since May 7, 2010
*/
@By(DataSource.REFERENCE)
-public class CallableLociWalker extends LocusWalker {
+public class CallableLoci extends LocusWalker {
@Output
PrintStream out;
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CompareCallableLociWalker.java b/public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CompareCallableLoci.java
similarity index 74%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CompareCallableLociWalker.java
rename to public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CompareCallableLoci.java
index cd5fdc505..64a51f1b3 100755
--- a/public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CompareCallableLociWalker.java
+++ b/public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CompareCallableLoci.java
@@ -41,7 +41,7 @@ import java.util.List;
/**
* Test routine for new VariantContext object
*/
-public class CompareCallableLociWalker extends RodWalker, long[][]> {
+public class CompareCallableLoci extends RodWalker, long[][]> {
@Output
protected PrintStream out;
@@ -54,8 +54,8 @@ public class CompareCallableLociWalker extends RodWalker map(RefMetaDataTracker tracker, ReferenceContext ref, AlignmentContext context) {
+ public List map(RefMetaDataTracker tracker, ReferenceContext ref, AlignmentContext context) {
if ( tracker != null ) {
- CallableLociWalker.CallableBaseState comp1 = getCallableBaseState(tracker, compTrack1);
- CallableLociWalker.CallableBaseState comp2 = getCallableBaseState(tracker, compTrack2);
+ CallableLoci.CallableBaseState comp1 = getCallableBaseState(tracker, compTrack1);
+ CallableLoci.CallableBaseState comp2 = getCallableBaseState(tracker, compTrack2);
if ( printState != null && comp1.getState() == printState1 && comp2.getState() == printState2 ) {
out.printf("%s %s %s %s%n", comp1.getLocation(), comp1.getState(), comp2.getLocation(), comp2.getState());
@@ -92,7 +92,7 @@ public class CompareCallableLociWalker extends RodWalker rodBinding) {
+ private CallableLoci.CallableBaseState getCallableBaseState(RefMetaDataTracker tracker, RodBinding rodBinding) {
//System.out.printf("tracker %s%n", tracker);
List bindings = tracker.getValues(rodBinding);
if ( bindings.size() != 1 ) {
@@ -101,8 +101,8 @@ public class CompareCallableLociWalker extends RodWalker comps, long[][] sum) {
+ public long[][] reduce(List comps, long[][] sum) {
if ( comps != null ) {
- CallableLociWalker.CallableBaseState comp1 = comps.get(0);
- CallableLociWalker.CallableBaseState comp2 = comps.get(1);
+ CallableLoci.CallableBaseState comp1 = comps.get(0);
+ CallableLoci.CallableBaseState comp2 = comps.get(1);
sum[comp1.getState().ordinal()][comp2.getState().ordinal()]++;
}
@@ -127,8 +127,8 @@ public class CompareCallableLociWalker extends RodWalker>, CoveragePartitioner> implements TreeReducible {
+public class DepthOfCoverage extends LocusWalker