diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/varianteval/VariantCounter.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/varianteval/VariantCounter.java index f121e1ffd..1d0c2c060 100755 --- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/varianteval/VariantCounter.java +++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/varianteval/VariantCounter.java @@ -29,7 +29,7 @@ public class VariantCounter extends BasicVariantAnalysis implements GenotypeAnal } public String update(Variation eval, RefMetaDataTracker tracker, char ref, AlignmentContext context) { - nSNPs += eval == null ? 0 : 1; + nSNPs += eval == null || eval.isReference()? 0 : 1; // TODO -- break the het check out to a different module used only for single samples diff --git a/java/src/org/broadinstitute/sting/utils/genotype/vcf/VCFRecord.java b/java/src/org/broadinstitute/sting/utils/genotype/vcf/VCFRecord.java index d7c40451b..527c39946 100644 --- a/java/src/org/broadinstitute/sting/utils/genotype/vcf/VCFRecord.java +++ b/java/src/org/broadinstitute/sting/utils/genotype/vcf/VCFRecord.java @@ -229,7 +229,12 @@ public class VCFRecord implements Variation, VariantBackedByGenotype { } public boolean hasAlternateAllele() { - return getAlternateAlleles().size() > 0; + for ( VCFGenotypeEncoding alt : this.mAlts ) { + if ( alt.getType() != VCFGenotypeEncoding.TYPE.UNCALLED ) + return true; + } + + return false; } public boolean isBiallelic() { @@ -279,6 +284,9 @@ public class VCFRecord implements Variation, VariantBackedByGenotype { switch ( type ) { case SINGLE_BASE: return VARIANT_TYPE.SNP; + case UNCALLED: + // If there are no alt alleles, all of the genotypes are reference or no calls, so we're a reference site + return VARIANT_TYPE.REFERENCE; case DELETION: return VARIANT_TYPE.DELETION; case INSERTION: diff --git a/java/test/org/broadinstitute/sting/playground/gatk/walkers/varianteval/VariantEvalWalkerIntegrationTest.java b/java/test/org/broadinstitute/sting/playground/gatk/walkers/varianteval/VariantEvalWalkerIntegrationTest.java index 9190f2646..1ba609d78 100644 --- a/java/test/org/broadinstitute/sting/playground/gatk/walkers/varianteval/VariantEvalWalkerIntegrationTest.java +++ b/java/test/org/broadinstitute/sting/playground/gatk/walkers/varianteval/VariantEvalWalkerIntegrationTest.java @@ -116,7 +116,7 @@ public class VariantEvalWalkerIntegrationTest extends WalkerTest { @Test public void testEvalGenotypeROD() { List md5 = new ArrayList(); - md5.add("978176e0b369c08c041a66045e995129"); + md5.add("010d1c7ce773b39f3de1355eb9682e4d"); /** * the above MD5 was calculated after running the following command: *