Mark DePristo
f8a56bc64b
Merge branch 'master' into rodRefactor
2011-08-08 16:58:18 -04:00
Mark DePristo
f8ad91b16f
Reverting a bunch of bad -B type drops
2011-08-08 16:57:38 -04:00
Eric Banks
d7813db217
Combine Variants was actually outputting invalid VCFs in cases where it was combining Variant Contexts with different alternate alleles: if any of the genotypes had PLs they were no longer valid/correct. Added a check for such cases (the combined VC has more alleles than an original VC) and strip out the PLs when triggered; added integration test to cover it. I also added the check to Select Variants, although it currently doesn't remove unused alleles so it should never trigger. Is there any reason not to strip out unused alleles after a select?
2011-08-08 16:25:35 -04:00
Mark DePristo
4f8fc0f2f1
VCF3 now dynamically determined
2011-08-08 15:05:47 -04:00
Mark DePristo
ba7353c561
Updated IntegrationTests to use the new type free format for VCF files
2011-08-08 15:04:38 -04:00
Mark DePristo
0810c42309
GATK now does dynamic type determination for VCF files
...
Added UnitTests covering all of the cases.
2011-08-08 14:45:46 -04:00
Mark DePristo
e36994e36b
Refactored a FeatureManager class from RMDTrackBuilder
...
New class handles (vastly more cleanly) the db of tribble codecs, features, and names for use throughout the GATK.
Added SelfScopingFeatureCodec interface that allows a FeatureCodec to examine a file and determine if the file can be parsed. This is the first step towards allowing the GATK to dynamically determine the type of a RodBinding.
2011-08-08 14:04:46 -04:00
Mark DePristo
e5fde0d16b
Merge branch 'master' into rodRefactor
2011-08-08 10:08:43 -04:00
Mark DePristo
526b524c3c
CombineVariants with new RodBinding. Bugfix
...
-- CombineVariants now uses the new RodBinding syntax, -V / --variants. Passed all integration tests on first run
-- Exposed gapping bug in the List<RodBinding<T>> system now fixed. ParserEngine now has a addRodBinding() that is called by RodBindingArgumentTypeDescriptor when it encounters each RodBinding. This allows the system to work with collection types that are recursively parsed by the system.
2011-08-07 20:16:51 -04:00
Ryan Poplin
6693407bd8
Merged bug fix from Stable into Unstable
2011-08-07 17:39:03 -04:00
Mark DePristo
1d8b1bae0a
Need to rename the integration test argument -mask to -maskName
2011-08-07 13:32:26 -04:00
Mark DePristo
ece8f0db5e
Added b37dbSNP129, needed for Queue
2011-08-07 11:26:07 -04:00
Mark DePristo
b0e91f85cf
fix merge from Khalid's Queue fix
2011-08-07 10:33:20 -04:00
Mark DePristo
4d88e72958
Merge remote-tracking branch 'remotes/khalid/rodRefactor' into rodRefactor
...
Conflicts:
public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariants.java
public/java/test/org/broadinstitute/sting/BaseTest.java
2011-08-07 10:32:27 -04:00
Khalid Shakir
f049461120
Changed @Argument to @Input on input RodBindings.
...
Changed shortname collision with longname.
Restored scala builds.
Updated HSP to use new syntax.
2011-08-06 20:44:19 -04:00
Mark DePristo
573700d18d
Adding missing import
2011-08-04 21:57:00 -04:00
Mark DePristo
14e43c3382
Final fix to RodBindingUnitTest to reset global counter variable
2011-08-04 21:52:39 -04:00
Mark DePristo
9308fbe3fb
VariantEval Integration Test parameterized for new novelty stratification
2011-08-04 18:08:47 -04:00
Ryan Poplin
98a96f07c1
Updated standard deviation parameter in VQSR to our current recommended value
2011-08-04 14:06:26 -04:00
Mark DePristo
58a60d4901
Merge branch 'master' into rodRefactor
2011-08-04 12:48:56 -04:00
Mark DePristo
d2078f09b2
Minor fixes to ITs
2011-08-04 12:47:55 -04:00
Eric Banks
f10588420c
Fixing path to dbSNP file as the other one was replaced
2011-08-04 12:36:24 -04:00
Mark DePristo
f0d798d47c
Bug fix: call RodBinding.resetNameCounter() in new ParsingEngine() so that we don't magically misnumber arguments in the integration tests where the GATK is only instantiated once.
2011-08-04 12:06:10 -04:00
Mark DePristo
490ca475fc
Replacing hardcoded dbsnp129 with BaseTest variable
2011-08-03 22:15:22 -04:00
Eric Banks
a831af1166
Another misprint when removing the references to -D
2011-08-03 21:29:21 -04:00
Mark DePristo
d0279bb28c
RodBinding names are now defaulting to the ArgumentTypeDescriptor fullname
...
Nearly all of the tools are passing integrationtests
2011-08-03 20:48:11 -04:00
Mark DePristo
d8f1ebf8c6
Parameterized RecalibrationWalkers with clean unstable database
2011-08-03 20:06:00 -04:00
Mark DePristo
41b3840d26
Took latest VEIT and updated to use dbsnp132 vcf
2011-08-03 18:40:32 -04:00
Mark DePristo
0ef85647f7
A working version of a GATKReportDiffableReader for the diffEngine!
2011-08-03 18:21:18 -04:00
Mark DePristo
acbd3d0922
Fixing up integration tests so more
2011-08-03 17:26:35 -04:00
Mark DePristo
8f696c7731
Continuing progress towards RodBinding 1.0
...
-- Cleaning up old interface to RMDT, docs and contracts added
-- Proper type checking for RodBinding for cases where the Tribble type isn't found or is the wrong type
2011-08-03 17:19:28 -04:00
Mark DePristo
800bb97f0b
Removed getFeaturesAsGATKFeature and created createGenomeLoc(Feature) in genomeLocParser
...
Updated all walkers that used the now deleted methods.
2011-08-03 16:04:51 -04:00
Mark DePristo
79e4a8f6d3
Merge
...
Conflicts:
private/java/src/org/broadinstitute/sting/gatk/walkers/qc/TestVariantContextWalker.java
public/java/src/org/broadinstitute/sting/gatk/walkers/phasing/PhaseByTransmission.java
public/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantDataManager.java
public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariants.java
public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/VariantValidationAssessor.java
public/java/test/org/broadinstitute/sting/gatk/walkers/recalibration/RecalibrationWalkersIntegrationTest.java
public/java/test/org/broadinstitute/sting/gatk/walkers/recalibration/RecalibrationWalkersPerformanceTest.java
public/java/test/org/broadinstitute/sting/gatk/walkers/varianteval/VariantEvalIntegrationTest.java
public/java/test/org/broadinstitute/sting/utils/variantcontext/VariantContextIntegrationTest.java
2011-08-03 15:09:47 -04:00
Mark DePristo
b25140db83
Contracts and documentation for some of RefMetaDataTracker
...
Continuing to fix integration tests that don't pass / run
2011-08-03 13:34:20 -04:00
Eric Banks
3de10b1ef8
Fixing misprint from Ryan's commit
2011-08-03 12:37:50 -04:00
Eric Banks
db2e0aaa1a
Darn, forgot to update unit tests.
2011-08-03 12:31:08 -04:00
Eric Banks
020b2408a8
Adding integration test for left alignment of indels
2011-08-03 12:19:44 -04:00
Eric Banks
5dc324ff35
Dealing with merge confict
2011-08-03 11:03:47 -04:00
Eric Banks
7c89fe01b3
Instead of having the padded reference base be some hackish attribute it is now an actual variable in the Variant Context class. More importantly, we now always require that it be present when padding is necessary - and validate as such upon construction of the VC. This cleans up the interface significantly because we no longer require that a reference base be passed in when writing a VC/VCF record.
2011-08-03 11:00:36 -04:00
Mark DePristo
d9bc673ff2
Fixed bad constructor in RMDTUnitTest
2011-08-03 09:42:43 -04:00
Khalid Shakir
5dcac7b064
GATKReport v0.2:
...
- Floating point column widths are measured correctly
- Using fixed width columns instead of white space separated which allows spaces embedded in cell values
- Legacy support for parsing white space separated v0.1 tables where the columns may not be fixed width
- Enforcing that table descriptions do not contain newlines so that tables can be parsed correctly
Replaced GATKReportTableParser with existing functionality in GATKReport
2011-08-03 00:24:47 -04:00
Mark DePristo
2874835997
Bug fix for type checking RodBindings
...
Now compares the feature class not the codec class.
UnitTests improvements
integrationtests on their way to actually running
2011-08-02 22:25:41 -04:00
Mark DePristo
b5e843f8f0
Approaching the end for the new RodBinding system
...
-- support for explicit naming of bindings (-X:name,type x)
-- support for automatic naming of bindings in lists (-X:vcf foo.vcf -X:vcf bar.vcf will generate internal names X and X2)
-- ParserEngineUnitTest expanded to cover all of the Rodbinding cases
-- RodBindingUnitTest tests all of the low-level accessors
-- Parsing engine throws UserExceptions when bad bindings are provided on the command line
2011-08-02 22:00:06 -04:00
Mark DePristo
83891271b5
--variants throughout integrationtests
2011-08-02 20:28:47 -04:00
Mark DePristo
3a27a25cfc
Validates that the tribble binding provides the right object types at startup
...
Tests to ensure this remains working
2011-08-02 20:11:24 -04:00
Ryan Poplin
b2cde87378
Removing --DBSNP syntax from BQSR integration tests
2011-08-02 15:34:38 -04:00
Mark DePristo
e4a67f3df1
RefMetaDataTracker has complete set of get() functions for List<RodBinding<T>>
...
Including unit tests
2011-08-02 14:28:35 -04:00
Mark DePristo
03741fb640
Merge branch 'master' into rodRefactor
...
Conflicts:
public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/VariantAnnotatorEngine.java
public/java/test/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerIntegrationTest.java
public/java/test/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerPerformanceTest.java
public/java/test/org/broadinstitute/sting/utils/variantcontext/VariantContextIntegrationTest.java
2011-08-02 14:21:58 -04:00
Mark DePristo
a366f9a18d
Updating tools to use the RodBinding<T> syntax
2011-08-02 14:05:51 -04:00
Eric Banks
b9d0d2af22
Adding back temporarily removed integration test now that the file permissions have been fixed.
2011-08-02 12:39:11 -04:00