From 2ed63fe17c04d49d6fb8d5dd0c45c9d8be1a1077 Mon Sep 17 00:00:00 2001 From: jmaguire Date: Wed, 25 Mar 2009 18:52:42 +0000 Subject: [PATCH] a bunch of changes that support pools. they don't appear to break single sample: Allele Frequency Metrics (LOD >= 5) ------------------------------------------------- Total loci : 9000 Total called with confidence : 8138 (90.42%) Number of variants : 11 (0.14%) (1/739) Fraction of variant sites in dbSNP : 81.82% git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@192 348d0f76-0448-11de-a6fe-93d51630548a --- .../walkers/AlleleFrequencyMetricsWalker.java | 5 +- .../gatk/walkers/AlleleFrequencyWalker.java | 236 ++++++++++++++---- 2 files changed, 195 insertions(+), 46 deletions(-) diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyMetricsWalker.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyMetricsWalker.java index 7961389cf..5fe59a4fd 100755 --- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyMetricsWalker.java +++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyMetricsWalker.java @@ -190,9 +190,10 @@ public class AlleleFrequencyMetricsWalker extends BasicLociWalker= 5) || (alleleFreq.LOD <= -5)) { System.out.print(alleleFreq.asTabularString()); } + //if ((alleleFreq.LOD >= 5) || (alleleFreq.LOD <= -5)) { System.out.print(alleleFreq.asTabularString()); } + System.out.print(alleleFreq.asTabularString()); - if (this.num_loci_total % 10000 == 0) { printMetrics(); } + if (this.num_loci_total % 1000 == 0) { printMetrics(); } return "null"; } diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyWalker.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyWalker.java index c3ecd8724..a722a334c 100755 --- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyWalker.java +++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyWalker.java @@ -12,12 +12,11 @@ import java.util.Arrays; public class AlleleFrequencyWalker extends BasicLociWalker { + int N=2; - public AlleleFrequencyEstimate map(List rodData, char ref, LocusContext context) { - - // Set number of chromosomes, N, to 2 for now - int N = 2; - + public AlleleFrequencyEstimate map(List rodData, char ref, LocusContext context) + { + // Convert context data into bases and 4-base quals // Convert context data into bases and 4-base quals String bases = getBases(context); double quals[][] = getOneBaseQuals(context); @@ -42,13 +41,19 @@ public class AlleleFrequencyWalker extends BasicLociWalker %s%n", dbsnp.toSimpleString(), dbsnp.strand, Utils.join("/", dbsnp.getAllelesFWD())); - System.out.printf("ROD: %s ",dbsnp.toMediumString()); + alleleFreq.notes += String.format(" ROD: %s ",dbsnp.toMediumString()); } } } @@ -112,7 +117,7 @@ public class AlleleFrequencyWalker extends BasicLociWalker= 5) || (alleleFreq.LOD <= -5)) { System.out.print(alleleFreq.asTabularString()); } - return 0; } - static int nuc2num[]; static char num2nuc[]; public AlleleFrequencyWalker() { @@ -276,6 +300,9 @@ public class AlleleFrequencyWalker extends BasicLociWalker