From 849dce799d8934e00246c43f3f049d8db9f63489 Mon Sep 17 00:00:00 2001 From: ebanks Date: Fri, 4 Sep 2009 14:21:46 +0000 Subject: [PATCH] This rod was all wrong for generating the alternate snp alleles (it returned null or even the wrong value); fixed. git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@1531 348d0f76-0448-11de-a6fe-93d51630548a --- .../sting/gatk/refdata/rodDbSNP.java | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/java/src/org/broadinstitute/sting/gatk/refdata/rodDbSNP.java b/java/src/org/broadinstitute/sting/gatk/refdata/rodDbSNP.java index e2e8f2bd9..dc01c9cfb 100644 --- a/java/src/org/broadinstitute/sting/gatk/refdata/rodDbSNP.java +++ b/java/src/org/broadinstitute/sting/gatk/refdata/rodDbSNP.java @@ -4,11 +4,7 @@ import net.sf.picard.util.SequenceUtil; import java.util.*; -import org.broadinstitute.sting.utils.GenomeLoc; -import org.broadinstitute.sting.utils.Utils; -import org.broadinstitute.sting.utils.MalformedGenomeLocException; -import org.broadinstitute.sting.utils.GenomeLocParser; -import org.broadinstitute.sting.gatk.refdata.AllelicVariant; +import org.broadinstitute.sting.utils.*; /** * Example format: @@ -165,8 +161,10 @@ public class rodDbSNP extends BasicReferenceOrderedDatum implements AllelicVaria loc = GenomeLocParser.parseGenomeLoc(contig, start, stop-1); name = parts[4]; - refBases = parts[5]; strand = parts[6]; + refBases = parts[7]; + if ( strand == "-" ) + refBases = BaseUtils.simpleReverseComplement(refBases); observed = parts[9]; molType = parts[10]; varType = parts[11]; @@ -190,24 +188,22 @@ public class rodDbSNP extends BasicReferenceOrderedDatum implements AllelicVaria } } - @Override public String getAltBasesFWD() { - // TODO Auto-generated method stub - return null; + List alleles = getAllelesFWD(); + return (alleles.get(0).equals(refBases) ? alleles.get(1) : alleles.get(0)); } - @Override public char getAltSnpFWD() throws IllegalStateException { - return getAllelesFWD().get(1).charAt(0); + if ( !isSNP() ) + throw new IllegalStateException("I'm not a SNP"); + return getAltBasesFWD().charAt(0); } - @Override public double getConsensusConfidence() { // TODO Auto-generated method stub return Double.MAX_VALUE; } - @Override public List getGenotype() throws IllegalStateException { return Arrays.asList(Utils.join("", getAllelesFWD())); } @@ -222,25 +218,21 @@ public class rodDbSNP extends BasicReferenceOrderedDatum implements AllelicVaria return avHet; } - @Override public int getPloidy() throws IllegalStateException { // TODO Auto-generated method stub return 0; } - @Override public double getVariationConfidence() { // TODO Auto-generated method stub return Double.MAX_VALUE; } - @Override public boolean isGenotype() { // TODO Auto-generated method stub return false; } - @Override public boolean isBiallelic() { // TODO Auto-generated method stub return observed.indexOf('/')==observed.lastIndexOf('/');