Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Now non-locatable data sources can create funcotations again. #5774

Merged
merged 2 commits into from
Mar 8, 2019

Conversation

jonn-smith
Copy link
Collaborator

Primarily the large integration tests check for the non-locatable
funcotation factories producing data.

Regenerated the expected output from large tests.

Fixes #5773

Primarily the large integration tests check for the non-locatable
funcotation factories producing data.

Regenerated the expected output from large tests.

Fixes #5773
@codecov-io
Copy link

codecov-io commented Mar 7, 2019

Codecov Report

Merging #5774 into master will increase coverage by 0.013%.
The diff coverage is 100%.

@@               Coverage Diff               @@
##              master     #5774       +/-   ##
===============================================
+ Coverage     86.985%   86.998%   +0.013%     
- Complexity     31863     31871        +8     
===============================================
  Files           1943      1942        -1     
  Lines         146768    146789       +21     
  Branches       16223     16216        -7     
===============================================
+ Hits          127666    127703       +37     
+ Misses         13189     13177       -12     
+ Partials        5913      5909        -4
Impacted Files Coverage Δ Complexity Δ
...dataSources/vcf/VcfFuncotationFactoryUnitTest.java 98.122% <100%> (+0.018%) 31 <1> (+1) ⬆️
...urces/cosmic/CosmicFuncotationFactoryUnitTest.java 90.654% <100%> (+0.178%) 16 <1> (+1) ⬆️
...tools/funcotator/DataSourceFuncotationFactory.java 77.966% <100%> (+2.04%) 20 <4> (+3) ⬆️
...r/dataSources/cosmic/CosmicFuncotationFactory.java 62.238% <100%> (-1.143%) 28 <1> (+1)
...er/tools/funcotator/FuncotatorIntegrationTest.java 85.693% <100%> (+0.44%) 114 <1> (+1) ⬆️
...ces/gencode/GencodeFuncotationFactoryUnitTest.java 94.047% <100%> (+0.009%) 68 <1> (+1) ⬆️
...es/xsv/SimpleKeyXsvFuncotationFactoryUnitTest.java 98.438% <100%> (+0.05%) 24 <1> (+1) ⬆️
...ataSources/xsv/SimpleKeyXsvFuncotationFactory.java 85.149% <100%> (-0.851%) 29 <1> (ø)
...es/xsv/LocatableXsvFuncotationFactoryUnitTest.java 96.732% <100%> (+0.043%) 15 <1> (+1) ⬆️
...utils/smithwaterman/SmithWatermanIntelAligner.java 50% <0%> (-30%) 1% <0%> (-2%)
... and 23 more

Copy link
Contributor

@LeeTL1220 LeeTL1220 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor stuff and a question. If you answer, feel free to merge.

@@ -292,7 +292,7 @@ if [[ $r -eq 0 ]] && ${doRunLargeTests} ; then
#INPUT=/Users/jonn/Development/gatk/src/test/resources/large/funcotator/regressionTestVariantSet2.vcf
#INPUT=/Users/jonn/Development/gatk/src/test/resources/large/funcotator/regressionTestHg19Large.vcf
#INPUT=/Users/jonn/Development/gatk/hg38_trio_liftoverb37.vcf
#INPUT=/Users/jonn/Development/gatk/tmp.vcf
INPUT=/Users/jonn/Development/gatk/tmp.vcf
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why this is needed. What is this stuff?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left over from testing. I'll remove.

@@ -135,6 +135,12 @@ public String getVersion() {
return version;
}

/**
* @return {@code True} if this {@link DataSourceFuncotationFactory} requires features to create {@link Funcotation}s. {@code False} otherwise.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any features? Or specific types? Please update docs.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes - any features. If the DataSourceFuncotationFactory relies on feature matching that the GATK engine provides, then this should be true.

Things that don't require features (like gene name matching data sources) don't require any features to be present to create a funcotation.


final List<Funcotation> outputFuncotations;
// Only get features if we need them:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you collapse to one line? blah? truestuff: falsestuff

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.

Added in another specific test for non-locatable data sources.
@jonn-smith
Copy link
Collaborator Author

Comments addressed. I also added in another test to check for this specific case and guard against it in the future.

@jonn-smith jonn-smith merged commit 210520b into master Mar 8, 2019
@jonn-smith jonn-smith deleted the jts_funcotator_simplexsv_check branch March 8, 2019 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants