diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/EmpiricalSubstitutionGenotypeLikelihoods.java b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/EmpiricalSubstitutionGenotypeLikelihoods.java index ae9c0a5bc..3130f785f 100755 --- a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/EmpiricalSubstitutionGenotypeLikelihoods.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/EmpiricalSubstitutionGenotypeLikelihoods.java @@ -240,8 +240,6 @@ public class EmpiricalSubstitutionGenotypeLikelihoods extends GenotypeLikelihood return EMPIRICAL_CACHE[a][i][j][k][x]; } - - protected void clearCache() { EMPIRICAL_CACHE = new GenotypeLikelihoods[EmpiricalSubstitutionGenotypeLikelihoods.SequencerPlatform.values().length][BaseUtils.BASES.length][QualityUtils.MAX_QUAL_SCORE][MAX_PLOIDY][2]; } // ----------------------------------------------------------------------------------------------------------------- diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypeLikelihoods.java b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypeLikelihoods.java index 17a351396..6d765bb1a 100644 --- a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypeLikelihoods.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypeLikelihoods.java @@ -188,11 +188,14 @@ public abstract class GenotypeLikelihoods implements Cloneable { } /** - * Sets the priors and clears the likelihoods cache. + * Sets the priors */ public void setPriors(DiploidGenotypePriors priors) { this.priors = priors; - clearCache(); + for ( DiploidGenotype g : DiploidGenotype.values() ) { + int i = g.ordinal(); + posteriors[i] = priors.getPriors()[i] + likelihoods[i]; + } } /** @@ -347,10 +350,6 @@ public abstract class GenotypeLikelihoods implements Cloneable { */ protected abstract GenotypeLikelihoods getSetCache( char observedBase, byte qualityScore, int ploidy, SAMRecord read, int offset, GenotypeLikelihoods val ); - /** - * Method for clearing the cache (in case we change the priors) - */ - protected abstract void clearCache(); protected GenotypeLikelihoods simpleGetSetCache( GenotypeLikelihoods[][][][] cache, char observedBase, byte qualityScore, int ploidy, diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/OneStateErrorGenotypeLikelihoods.java b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/OneStateErrorGenotypeLikelihoods.java index ca46edf2e..1dae5e5db 100755 --- a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/OneStateErrorGenotypeLikelihoods.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/OneStateErrorGenotypeLikelihoods.java @@ -47,5 +47,4 @@ public class OneStateErrorGenotypeLikelihoods extends GenotypeLikelihoods { SAMRecord read, int offset, GenotypeLikelihoods val ) { return simpleGetSetCache(ONE_STATE_CACHE, observedBase, qualityScore, ploidy, read, offset, val); } - protected void clearCache() { ONE_STATE_CACHE = new GenotypeLikelihoods[BaseUtils.BASES.length][QualityUtils.MAX_QUAL_SCORE][MAX_PLOIDY][2]; } } diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/ThreeStateErrorGenotypeLikelihoods.java b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/ThreeStateErrorGenotypeLikelihoods.java index bda9481b6..fde835d3d 100755 --- a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/ThreeStateErrorGenotypeLikelihoods.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/ThreeStateErrorGenotypeLikelihoods.java @@ -40,5 +40,4 @@ public class ThreeStateErrorGenotypeLikelihoods extends GenotypeLikelihoods { SAMRecord read, int offset, GenotypeLikelihoods val ) { return simpleGetSetCache(THREE_STATE_CACHE, observedBase, qualityScore, ploidy, read, offset, val); } - protected void clearCache() { THREE_STATE_CACHE = new GenotypeLikelihoods[BaseUtils.BASES.length][QualityUtils.MAX_QUAL_SCORE][MAX_PLOIDY][2]; } }