Chris Hartl
bf5748a538
Forgot to actually put in the md5. Also with the new change to record pairing and filtering, the multiple-records integration test changed: the indel records (T/TG | T/TGACA) are matched up (rather than left separate) resulting in properly identifying mismatching alleles, rather than HET-UNAVAILABLE and UNAVAILABLE-HET. Very nice.
2013-01-18 10:25:36 -05:00
Chris Hartl
91030e9afa
Bugfix: records that get paired up during the resolution of multiple-records-per-site were not going into genotype-level filtering. Caught via testing.
...
Testing for moltenized output, and for genotype-level filtering. This tool is now fully functional. There are three todo items:
1) Docs
2) An additional output table that gives concordance proportions normalized by records in both eval and comp (not just total in eval or total in comp)
3) Code cleanup for table creation (putting a table together the way I do takes -way- too many lines of code)
2013-01-18 09:49:48 -05:00
Chris Hartl
e15d4ad278
Addition of moltenize argument for moltenized tabular output. NRD/NRS not moltenized because there are only two columns.
2013-01-16 18:00:23 -05:00
Chris Hartl
327169b283
Refactor the method that identifies the site overlap type into the type enum class (so it can be used elsewhere potentially).
...
Completed todo item: for sites like
(eval)
20 12345 A C
20 12345 A AC
(comp)
20 12345 A C
20 12345 A ACCC
the records will be matched by the presence of a non-empty intersection of alleles. Any leftover records are then paired with an empty variant context (as though the call was unique). This has one somewhat counterintuitive feature, which is that normally
(eval)
20 12345 A AC
(comp)
20 12345 A ACCC
would be classified as 'ALLELES_DO_NOT_MATCH' (and not counted in genotype tables), in the presence of the SNP, they're counted as EVAL_ONLY and TRUTH_ONLY respectively.
+ integration test
2013-01-15 12:13:45 -05:00
Chris Hartl
682c59ff04
Merge branch 'master' of gsa2:/humgen/gsa-scr1/chartl/dev/unstable
2013-01-14 13:27:34 -05:00
Chris Hartl
61bc334df1
Ensure output table formatting does not contain NaNs. For (0 eval ref calls)/(0 comp ref calls), set the proportion to 0.00.
...
Added integration tests (checked against manual tabulation)
2013-01-14 09:21:30 -05:00
Ryan Poplin
a7fe334a3f
calculating the md5s for the new tests.
2013-01-11 15:43:52 -05:00
Ryan Poplin
65afec2a53
Merge branch 'master' of github.com:broadinstitute/gsa-unstable
2013-01-11 15:22:52 -05:00
Mark DePristo
85b529cced
Updating MD5s in HC and UG that changed due to new LIBS
...
-- Resolved what was clearly a bug in UG (GGA mode was returning a neighboring, equivalent indel site that wasn't in input list. Not ideal)
-- Trivial read count differences in HC
2013-01-11 15:17:19 -05:00
Mark DePristo
8b83f4d6c7
Near final cleanup of PileupElement
...
-- All functions documented and unit tested
-- New constructor interface
-- Cleanup some uses of old / removed functionality
2013-01-11 15:17:17 -05:00
Mark DePristo
fb9eb3d4ee
PileupElement and LIBS cleanup
...
-- function to create pileup elements in AlignmentStateMachine and LIBS
-- Cleanup pileup element constructors, directing users to LIBS.createPileupFromRead() that really does the right thing
2013-01-11 15:17:17 -05:00
Mark DePristo
cc1d259cac
Implement get Length and Bases of OfImmediatelyFollowingIndel in PileupElement
...
-- Added unit tests for this behavior. Updated users of this code
2013-01-11 15:17:17 -05:00
Mark DePristo
2c38310868
Create LIBS using new AlignmentStateMachine infrastructure
...
-- Optimizations to AlignmentStateMachine
-- Properly count deletions. Added unit test for counting routines
-- AlignmentStateMachine.java is no longer recursive
-- Traversals now use new LIBS, not the old one
2013-01-11 15:17:17 -05:00
Mark DePristo
b53286cc3c
HaplotypeCaller mode to skip assembly and genotyping for performance testing
...
-- Added HCPerformance evaluation Qscript
-- Added some docs about one of the HC integration tests
-- HaplotypeCaller / ART performance evaluation script
2013-01-11 15:17:16 -05:00
Ryan Poplin
e952296c10
Adding HC GGA integration test to cover duplicated input alleles.
2013-01-11 15:01:27 -05:00
Ryan Poplin
7f7f40f851
Adding additional HC GGA integration tests to cover more complicated input alleles.
2013-01-11 14:36:21 -05:00
Eric Banks
85baf71b39
Merged bug fix from Stable into Unstable
2013-01-11 11:05:27 -05:00
Eric Banks
d78539774f
Another RR bug: off by one error led to ArrayIndexOutOfBoundsException when working with multiple samples and the variant region ended 1 base after the end of the last read for a given sample.
2013-01-11 11:05:09 -05:00
Eric Banks
79b93f659c
Merged bug fix from Stable into Unstable
2013-01-11 09:20:13 -05:00
Eric Banks
67fafbb625
Forgot an include
2013-01-11 09:19:46 -05:00
Eric Banks
6bf0cc32f9
When reducing multiple samples it is possible to try to close a region that for a given sample has no reads. Currently we'd NPE. Fixed.
2013-01-11 09:16:19 -05:00
Eric Banks
e7906713d9
Moving some random walkers back to public as requested by Mark. Mauricio will the licenses get updated automatically?
2013-01-11 02:03:43 -05:00
Eric Banks
3a51823c2a
Clean up imports
2013-01-10 23:35:01 -05:00
Eric Banks
e4b7b1955c
Forgot to add the note about length normalization to the QD docs
2013-01-10 23:34:06 -05:00
Eric Banks
ff5ac986d8
Fix docs for QD
2013-01-10 23:31:46 -05:00
Mauricio Carneiro
2a4ccfe6fd
Updated all JAVA file licenses accordingly
...
GSATDG-5
2013-01-10 17:06:41 -05:00
Mauricio Carneiro
dd177b1714
Removing fully commented out varianteval evaluators
...
- Files were completely commmented out, and were screwing up my license script. Dont like them. Removed them.
GSATDG-5
2013-01-10 17:06:12 -05:00
Chris Hartl
80dec72c53
Merge branch 'master' of gsa2:/humgen/gsa-scr1/chartl/dev/unstable
2013-01-10 14:35:59 -05:00
Chris Hartl
31a5f88c4f
Expanded unit tests to cover the Concordance Metrics class fairly uniformly.
2013-01-10 14:33:47 -05:00
Ryan Poplin
1a18947abf
Adding new command line argument requested on the forum to control the maximum number of haplotypes that are sent forward for genotyping. In the presence of a large degree of heterozygosity the current algorithm breaks down and so this argument would need to be increased.
2013-01-09 15:54:02 -05:00
Ryan Poplin
487fb2afb4
Bug fix for the case of overlapping assembled and partially-assembled events created by the HC. Unfortunately the symbolic allele can't be combined with the indel allele because the reference basis will change.
2013-01-09 15:30:46 -05:00
Chris Hartl
6787f86803
Eliminate the import of DiploidGenotype, which switched public/private underneath me but for some reason didn't stop me from compiling...
2013-01-09 13:23:24 -05:00
Chris Hartl
c1de92b511
Add in some todo items
2013-01-09 13:16:06 -05:00
Chris Hartl
8d126161e2
Merge branch 'master' of gsa2:/humgen/gsa-scr1/chartl/dev/unstable
2013-01-09 13:15:04 -05:00
Eric Banks
3a0dd4b175
Oops, I broke the build. NOW we shouldn't have any more public->protected dependancies.
2013-01-09 11:12:28 -05:00
Eric Banks
a921b06e02
Merge branch 'master' of github.com:broadinstitute/gsa-unstable
2013-01-09 11:06:17 -05:00
Eric Banks
4fa439d89e
Move some classes back to public because they are used in the engine. Move some test classes to protected. We should have no more public->protected dependancies now
2013-01-09 11:06:10 -05:00
Ryan Poplin
396bce1f28
Reverting this change until we can figure out the right thing to do here.
2013-01-09 10:51:30 -05:00
Eric Banks
676e79542a
Bring CombineVariants back to public since it's used for SG. I needed to break ChromosomeCountConstants out of ChromosomeCounts to make this work.
2013-01-09 10:39:48 -05:00
Ryan Poplin
c87ad8c0ef
Bug fixes related to HC's GGA mode. Tracking just the artificial allele isn't sufficient when there are multiple GGA records that change the reference basis. Also, duplicated records screw up the tracking of merged alleles.
2013-01-09 10:00:46 -05:00
Chris Hartl
ad7c2a08d4
Normalize by the event type counts, not the total genotype counts: more useful normalization.
2013-01-09 09:12:41 -05:00
Chris Hartl
b56754606b
Initial break-out of GenotypeConcordance as a standalone walker. Some basic functionality testing. Currently performs only a pairwise comparison, but is very careful about proper tabulation through the GenotypeType enum.
2013-01-09 00:34:07 -05:00
Eric Banks
264cc9e78d
Resolve protected->public dependencies for BQSR by wrapping the BQSR-specific arguments in a new class.
...
Instead of the GATK Engine creating a new BaseRecalibrator (not clean), it just keeps track of the arguments (clean).
There are still some dependency issues, but it looks like they are related to Ami's code. Need to look into it further.
2013-01-08 16:23:29 -05:00
Eric Banks
ee7d85c6e6
Move around the DiploidGenotype classes (so it can be used by the GATKPaperGenotyper)
2013-01-08 15:53:11 -05:00
Eric Banks
0e2e672521
Merge branch 'master' of github.com:broadinstitute/gsa-unstable
2013-01-08 15:46:39 -05:00
Eric Banks
f0bd1b5ae5
Okay, all public->protected dependencies are gone except for the BQSR arguments. I'll need to think through this but should be able to make that work too.
2013-01-08 15:46:32 -05:00
Tad Jordan
9cbb2b868f
ErrorRatePerCycleIntegrationTest fix
...
-- sorting by row is required
2013-01-08 14:53:07 -05:00
Eric Banks
b099e2b4ae
Moving integration tests to protected
2013-01-08 09:34:08 -05:00
Eric Banks
dfe4cf1301
When merging the PerReadAlleleLikelihoodMap classes, I forgot to initialize the underlying objects. This was causing the LargeScaleTests to fail.
2013-01-08 09:24:12 -05:00
Eric Banks
9e6c2afb28
Not sure why IntelliJ didn't add this for commit like the other dirs
2013-01-07 18:11:07 -05:00