Gotta include the changes i made to get an init function into the contexts
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5368 348d0f76-0448-11de-a6fe-93d51630548a
This commit is contained in:
parent
835a26d145
commit
9e12cd1312
|
|
@ -41,6 +41,9 @@ public abstract class AssociationContext<X> {
|
||||||
// do we filter the current location (e.g. omit from window)
|
// do we filter the current location (e.g. omit from window)
|
||||||
public boolean filter(MapExtender m) { return true; }
|
public boolean filter(MapExtender m) { return true; }
|
||||||
|
|
||||||
|
// a basic initialization of the context (give the walker for access to object?)
|
||||||
|
public void init(RegionalAssociationWalker walker) { }
|
||||||
|
|
||||||
public Map<Sample,Object> mapLocus(MapExtender extender) {
|
public Map<Sample,Object> mapLocus(MapExtender extender) {
|
||||||
Map<Sample,ReadBackedPileup> pileups;
|
Map<Sample,ReadBackedPileup> pileups;
|
||||||
if ( ! usePreviouslySeenReads() ) {
|
if ( ! usePreviouslySeenReads() ) {
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,6 @@ public class MapExtender {
|
||||||
filtElems.add(e);
|
filtElems.add(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
readFilteredPileup.put(sac.getKey(),new ReadBackedPileupImpl(current.getRef().getLocus(),filtElems));
|
readFilteredPileup.put(sac.getKey(),new ReadBackedPileupImpl(current.getRef().getLocus(),filtElems));
|
||||||
} else {
|
} else {
|
||||||
readFilteredPileup = fullPileup;
|
readFilteredPileup = fullPileup;
|
||||||
|
|
|
||||||
|
|
@ -4,9 +4,11 @@ import org.broadinstitute.sting.commandline.Argument;
|
||||||
import org.broadinstitute.sting.commandline.Output;
|
import org.broadinstitute.sting.commandline.Output;
|
||||||
import org.broadinstitute.sting.gatk.contexts.AlignmentContext;
|
import org.broadinstitute.sting.gatk.contexts.AlignmentContext;
|
||||||
import org.broadinstitute.sting.gatk.contexts.ReferenceContext;
|
import org.broadinstitute.sting.gatk.contexts.ReferenceContext;
|
||||||
|
import org.broadinstitute.sting.gatk.datasources.sample.Sample;
|
||||||
import org.broadinstitute.sting.gatk.refdata.RefMetaDataTracker;
|
import org.broadinstitute.sting.gatk.refdata.RefMetaDataTracker;
|
||||||
import org.broadinstitute.sting.gatk.walkers.LocusWalker;
|
import org.broadinstitute.sting.gatk.walkers.LocusWalker;
|
||||||
import org.broadinstitute.sting.gatk.walkers.TreeReducible;
|
import org.broadinstitute.sting.gatk.walkers.TreeReducible;
|
||||||
|
import org.broadinstitute.sting.utils.SampleUtils;
|
||||||
import org.broadinstitute.sting.utils.exceptions.StingException;
|
import org.broadinstitute.sting.utils.exceptions.StingException;
|
||||||
import org.broadinstitute.sting.utils.exceptions.UserException;
|
import org.broadinstitute.sting.utils.exceptions.UserException;
|
||||||
|
|
||||||
|
|
@ -65,7 +67,9 @@ public class RegionalAssociationWalker extends LocusWalker<MapHolder, RegionalAs
|
||||||
// todo -- this should use the package handler like variant eval
|
// todo -- this should use the package handler like variant eval
|
||||||
Set<AssociationContext> validAssociations = new HashSet<AssociationContext>();
|
Set<AssociationContext> validAssociations = new HashSet<AssociationContext>();
|
||||||
for ( String s : associationsToUse ) {
|
for ( String s : associationsToUse ) {
|
||||||
validAssociations.add(stringToAssociationContext(s));
|
AssociationContext context = stringToAssociationContext(s);
|
||||||
|
context.init(this);
|
||||||
|
validAssociations.add(context);
|
||||||
}
|
}
|
||||||
return validAssociations;
|
return validAssociations;
|
||||||
}
|
}
|
||||||
|
|
@ -79,4 +83,8 @@ public class RegionalAssociationWalker extends LocusWalker<MapHolder, RegionalAs
|
||||||
public void onTraversalDone(RegionalAssociationHandler rac) {
|
public void onTraversalDone(RegionalAssociationHandler rac) {
|
||||||
// do nothing
|
// do nothing
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Set<Sample> getSamples() {
|
||||||
|
return getToolkit().getSAMFileSamples();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue