Commit d9732c8a authored by Peter van 't Hof's avatar Peter van 't Hof
Browse files

Add List to resolveConflict

parent 0d41765c
......@@ -57,6 +57,8 @@ class SeqStat(val root: Configurable) extends ToolCommandFuntion with Summarizab
override def resolveSummaryConflict(v1: Any, v2: Any, key: String): Any = {
(v1, v2) match {
case (v1: Array[_], v2: Array[_]) => v1.zip(v2).map(v => resolveSummaryConflict(v._1, v._2, key))
case (v1: List[_], v2: List[_]) => v1.zip(v2).map(v => resolveSummaryConflict(v._1, v._2, key))
case (v1: Int, v2: Int) if key == "len_min" => if (v1 < v2) v1 else v2
case (v1: Int, v2: Int) if key == "len_max" => if (v1 > v2) v1 else v2
case (v1: Int, v2: Int) => v1 + v2
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment