diff --git a/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisTK.java b/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisTK.java index 542d5df2e..d8f66489a 100644 --- a/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisTK.java +++ b/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisTK.java @@ -10,8 +10,8 @@ import net.sf.samtools.util.RuntimeIOException; import org.apache.commons.cli.Option; import org.apache.commons.cli.OptionBuilder; import org.apache.log4j.Logger; -import org.broadinstitute.sting.gatk.executive.LinearMicroManager; import org.broadinstitute.sting.gatk.executive.MicroScheduler; +import org.broadinstitute.sting.gatk.executive.LinearMicroScheduler; import org.broadinstitute.sting.gatk.refdata.ReferenceOrderedData; import org.broadinstitute.sting.gatk.refdata.ReferenceOrderedDatum; import org.broadinstitute.sting.gatk.traversals.*; @@ -264,11 +264,11 @@ public class GenomeAnalysisTK extends CommandLineProgram { Utils.scareUser(String.format("Analysis %s doesn't support SAM/BAM reads, but a read file %s was provided", Analysis_Name, INPUT_FILES)); if ( WALK_ALL_LOCI ) { - // TODO: Temporary debugging code. Activate the new debugging code only when the MicroManager + // TODO: Temporary debugging code. Activate the new debugging code only when the MicroScheduler // is not filtered. if( !DISABLE_THREADING ) { logger.warn("Preliminary threading support ENABLED"); - microScheduler = new LinearMicroManager( INPUT_FILES, REF_FILE_ARG, numThreads ); + microScheduler = new LinearMicroScheduler( INPUT_FILES, REF_FILE_ARG, numThreads ); this.engine = microScheduler.getTraversalEngine(); } else { diff --git a/java/src/org/broadinstitute/sting/gatk/executive/LinearMicroManager.java b/java/src/org/broadinstitute/sting/gatk/executive/LinearMicroScheduler.java similarity index 93% rename from java/src/org/broadinstitute/sting/gatk/executive/LinearMicroManager.java rename to java/src/org/broadinstitute/sting/gatk/executive/LinearMicroScheduler.java index c5e899eb0..39ae1c6b6 100644 --- a/java/src/org/broadinstitute/sting/gatk/executive/LinearMicroManager.java +++ b/java/src/org/broadinstitute/sting/gatk/executive/LinearMicroScheduler.java @@ -12,7 +12,6 @@ import org.broadinstitute.sting.gatk.traversals.TraverseLociByReference; import org.broadinstitute.sting.gatk.walkers.LocusWalker; import org.broadinstitute.sting.gatk.walkers.Walker; import org.broadinstitute.sting.utils.GenomeLoc; -import org.broadinstitute.sting.utils.fasta.IndexedFastaSequenceFile; import java.io.File; import java.util.List; @@ -21,7 +20,7 @@ import java.util.List; * A micro-scheduling manager for N-way threaded execution of a traversal * */ -public class LinearMicroManager extends MicroScheduler { +public class LinearMicroScheduler extends MicroScheduler { private TraverseLociByReference traversalEngine = null; @@ -29,7 +28,7 @@ public class LinearMicroManager extends MicroScheduler { return traversalEngine; } - public LinearMicroManager( List reads, // the reads file(s) + public LinearMicroScheduler( List reads, // the reads file(s) File refFile, // the reference file driving the traversal int nThreadsToUse ) { // maximum number of threads to use to do the work super( reads, refFile ); diff --git a/java/src/org/broadinstitute/sting/gatk/executive/MicroScheduler.java b/java/src/org/broadinstitute/sting/gatk/executive/MicroScheduler.java index a26218f92..aab8836f5 100755 --- a/java/src/org/broadinstitute/sting/gatk/executive/MicroScheduler.java +++ b/java/src/org/broadinstitute/sting/gatk/executive/MicroScheduler.java @@ -27,7 +27,7 @@ public abstract class MicroScheduler { private List reads; private static long SHARD_SIZE = 100000L; - protected static Logger logger = Logger.getLogger(LinearMicroManager.class); + protected static Logger logger = Logger.getLogger(MicroScheduler.class); protected IndexedFastaSequenceFile reference;