diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/EMGenotypeCalculationModel.java b/archive/java/src/org/broadinstitute/sting/multisamplecaller/EMGenotypeCalculationModel.java similarity index 100% rename from java/src/org/broadinstitute/sting/gatk/walkers/genotyper/EMGenotypeCalculationModel.java rename to archive/java/src/org/broadinstitute/sting/multisamplecaller/EMGenotypeCalculationModel.java diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/PointEstimateGenotypeCalculationModel.java b/archive/java/src/org/broadinstitute/sting/multisamplecaller/PointEstimateGenotypeCalculationModel.java similarity index 100% rename from java/src/org/broadinstitute/sting/gatk/walkers/genotyper/PointEstimateGenotypeCalculationModel.java rename to archive/java/src/org/broadinstitute/sting/multisamplecaller/PointEstimateGenotypeCalculationModel.java diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypeCalculationModel.java b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypeCalculationModel.java index 2e352c79f..30d2d1c3c 100755 --- a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypeCalculationModel.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypeCalculationModel.java @@ -18,7 +18,6 @@ import java.util.*; public abstract class GenotypeCalculationModel implements Cloneable { public enum Model { - EM_POINT_ESTIMATE, JOINT_ESTIMATE, POOLED } diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypeCalculationModelFactory.java b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypeCalculationModelFactory.java index 5713a7c13..e97af33ad 100755 --- a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypeCalculationModelFactory.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypeCalculationModelFactory.java @@ -64,9 +64,6 @@ public class GenotypeCalculationModelFactory { PrintStream beagleWriter) { GenotypeCalculationModel gcm; switch ( UAC.genotypeModel ) { - case EM_POINT_ESTIMATE: - gcm = new PointEstimateGenotypeCalculationModel(); - break; case JOINT_ESTIMATE: gcm = new DiploidGenotypeCalculationModel(); break; diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedArgumentCollection.java b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedArgumentCollection.java index 6d634b715..93ee147af 100755 --- a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedArgumentCollection.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedArgumentCollection.java @@ -31,7 +31,7 @@ import org.broadinstitute.sting.utils.cmdLine.Argument; public class UnifiedArgumentCollection { // control the various models to be used - @Argument(fullName = "genotype_model", shortName = "gm", doc = "Genotype calculation model to employ -- JOINT_ESTIMATE is currently the default, while POOLED and EM_POINT_ESTIMATE are available.", required = false) + @Argument(fullName = "genotype_model", shortName = "gm", doc = "Genotype calculation model to employ -- JOINT_ESTIMATE is currently the default, while POOLED is also available.", required = false) public GenotypeCalculationModel.Model genotypeModel = GenotypeCalculationModel.Model.JOINT_ESTIMATE; @Argument(fullName = "base_model", shortName = "bm", doc = "Base substitution model to employ -- EMPIRICAL is the recommended default, but it's possible to select the ONE_STATE and THREE_STATE models for comparison purposes", required = false) diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyper.java b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyper.java index 52c60489a..dd5bca9f5 100755 --- a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyper.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyper.java @@ -97,7 +97,7 @@ public class UnifiedGenotyper extends LocusWalker 1 && UAC.ASSUME_SINGLE_SAMPLE != null ) { // the ASSUME_SINGLE_SAMPLE argument can't be handled (at least for now) while we are multi-threaded because the IO system doesn't know how to get the sample name throw new IllegalArgumentException("For technical reasons, the ASSUME_SINGLE_SAMPLE argument cannot be used with multiple threads"); @@ -257,19 +253,17 @@ public class UnifiedGenotyper extends LocusWalker