Changes to report logic: STRY0017737 #188
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
|
|
||
| class ReportFunctions { | ||
|
|
||
| enum FuncType { | ||
|
|
||
| GENERIC, | ||
| CONTIG, | ||
| READQUALITY, | ||
| AUTOFAIL, | ||
| COVERAGE | ||
|
|
||
| } | ||
|
|
||
| static def select_qc_func(java.util.LinkedHashMap qual_data, java.lang.String metric, java.util.ArrayList qc_message, java.util.LinkedHashMap meta_info, java.lang.String func) { | ||
| def check_failed = 0 | ||
| def reisolate = 0 | ||
| def resequence = 0 | ||
| def check_ignored = 0 | ||
| def failed_p = false | ||
| def checks = 0 | ||
| def function = func as FuncType | ||
|
|
||
| switch (function) { | ||
| case FuncType.GENERIC: | ||
| (checks, | ||
| reisolate, | ||
| resequence, | ||
| failed_p, | ||
| check_failed, | ||
| check_ignored) = ReportFunctions.generic_qc_func(qual_data, metric, qc_message) | ||
| break | ||
| case FuncType.AUTOFAIL: | ||
| (checks, | ||
| reisolate, | ||
| resequence, | ||
| failed_p, | ||
| check_failed, | ||
| check_ignored) = ReportFunctions.autofail_reisolate(qual_data, metric, qc_message) | ||
| break | ||
| case FuncType.READQUALITY: | ||
| if (!meta_info.assembly) { | ||
| (checks, | ||
| reisolate, | ||
| resequence, | ||
| failed_p, | ||
| check_failed, | ||
| check_ignored) = ReportFunctions.generic_qc_func(qual_data, metric, qc_message) | ||
| } | ||
| break | ||
| case FuncType.COVERAGE: | ||
| if (!meta_info.assembly) { | ||
| (checks, | ||
| reisolate, | ||
| resequence, | ||
| failed_p, | ||
| check_failed, | ||
| check_ignored) = ReportFunctions.generic_qc_func(qual_data, metric, qc_message) | ||
| if (!failed_p && meta_info.downsampled) { | ||
| qc_message.add('The sample may have been downsampled too aggressively, if this is the cause please re-run sample with a different target depth.') | ||
| } | ||
| } | ||
| break | ||
| case FuncType.CONTIG: | ||
| (checks, | ||
| reisolate, | ||
| resequence, | ||
| failed_p, | ||
| check_failed, | ||
| check_ignored) = ReportFunctions.contig_qc_func(qual_data, metric, qc_message) | ||
| break | ||
| default: | ||
| throw NoSuchMethodExeption("No function for $func exists.") | ||
| } | ||
|
|
||
| return [checks, reisolate, resequence, failed_p, check_failed, check_ignored] | ||
| } | ||
|
|
||
| static def contig_qc_func(java.util.LinkedHashMap qual_data, java.lang.String metric, java.util.ArrayList qc_message) { | ||
| def checks_failed = 0 | ||
| def reisolate = 0 | ||
| def resequence = 0 | ||
| def checks_ignored = 0 | ||
| def failed_p = false | ||
| def checks = 0 | ||
|
|
||
| if (qual_data && qual_data.containsKey(metric) && !qual_data[metric].status) { | ||
| checks_failed = 1 | ||
| failed_p = true | ||
| }else if (qual_data && (!qual_data.containsKey(metric) || !qual_data[metric].status)) { | ||
| checks_ignored = 1 | ||
| }else if (qual_data == null) { | ||
| checks_ignored = 1 | ||
| } | ||
| checks += 1 | ||
| return [checks, reisolate, resequence, failed_p, checks_failed, checks_ignored] | ||
| } | ||
|
|
||
| static def generic_qc_func(java.util.LinkedHashMap qual_data, java.lang.String metric, java.util.ArrayList qc_message) { | ||
| def reisolate = 0 | ||
| def resequence = 0 | ||
| def failed_p = false | ||
| def checks_failed = 0 | ||
| def checks_ignored = 0 | ||
| def checks = 0 | ||
| if (qual_data && qual_data.containsKey(metric) && !qual_data[metric].status) { | ||
| reisolate = 1 | ||
| resequence = 1 | ||
| failed_p = true | ||
| checks_failed = 1 | ||
| }else if (qual_data && (!qual_data.containsKey(metric) || !qual_data[metric].status)) { | ||
| checks_ignored = 1 | ||
| }else if (qual_data == null) { | ||
| checks_ignored = 1 | ||
| } | ||
| checks += 1 | ||
| return [checks, reisolate, resequence, failed_p, checks_failed, checks_ignored] | ||
| } | ||
|
|
||
| static def autofail_reisolate(java.util.LinkedHashMap qual_data, java.lang.String metric, java.util.ArrayList qc_message) { | ||
| def reisolate = 0 | ||
| def resequence = 0 | ||
| def failed_p = false | ||
| def checks_failed = 0 | ||
| def checks_ignored = 0 | ||
| def checks = 0 | ||
| if (qual_data && qual_data.containsKey(metric) && !qual_data[metric].status) { | ||
| reisolate = 1 | ||
| resequence = 1 | ||
| failed_p = true | ||
| checks_failed = 1 | ||
| }else if (qual_data && (!qual_data.containsKey(metric) || !qual_data[metric].status)) { | ||
| checks_ignored = 1 | ||
| }else if (qual_data == null) { | ||
| checks_ignored = 1 | ||
| } | ||
| checks += 1 | ||
| return [checks, reisolate, resequence, failed_p, checks_failed, checks_ignored] | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you add a
defaultcase here that raises an exception about an invalid FuncType (though I suspect you would likely also get an exception raised when casting the string to the enum FuncType anyways).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed in: e67cbdd