Skip to content
Snippets Groups Projects
Commit fcecdf0c authored by Peter van 't Hof's avatar Peter van 't Hof
Browse files

Change key sets

parent 8eb7deef
No related branches found
No related tags found
No related merge requests found
......@@ -275,12 +275,12 @@ class VariantEffectPredictor(val root: Configurable) extends BiopetCommandLineFu
else Map()
}
protected val removeOnConflict = Set("Output_file", "Command_line_options", "Run_time", "Start_time", "End_time", "Input_file_(format)", "Novel_/_existing_variants")
protected val nonNumber = Set("VEP_version_(API)", "Cache/Database", "Species")
protected val removeOnConflict = Set("Output_file", "Run_time", "Start_time", "End_time", "Novel_/_existing_variants")
protected val nonNumber = Set("VEP_version_(API)", "Cache/Database", "Species", "Command_line_options", "Input_file_(format)")
override def resolveSummaryConflict(v1: Any, v2: Any, key: String): Any = {
if (removeOnConflict.contains(key)) None
else if (nonNumber.contains(key)) v1
else if (nonNumber.contains(key)) v2
else {
(v1, v2) match {
case (x1: Int, x2: Int) => x1 + x2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment