anyone can consume an invalid data gap. and data gaps aren't allowed …

…to take part in bridge merges except when they're the betweener
sobri909 · Jun 3, 2018 · 7b7998c · 7b7998c
1 parent 4f71789
commit 7b7998c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/LocoKit/Base/Timelines/MergeScores.swift b/LocoKit/Base/Timelines/MergeScores.swift
@@ -38,8 +38,8 @@ class MergeScores {
         // data gaps can only consume data gaps
         if consumer.isDataGap { return consumee.isDataGap ? .perfect : .impossible }
 
-        // no one except data gaps can consume data gaps
-        if consumee.isDataGap { return .impossible }
+        // anyone can consume an invalid data gap, but no one can consume a valid data gap
+        if consumee.isDataGap { return consumee.isInvalid ? .medium : .impossible }
 
         // nolos can only consume nolos
         if consumer.isNolo { return consumee.isNolo ? .perfect : .impossible }

diff --git a/LocoKit/Base/Timelines/TimelineProcessor.swift b/LocoKit/Base/Timelines/TimelineProcessor.swift
@@ -61,7 +61,7 @@ public class TimelineProcessor {
 
                     // if next has a lesser keepness, look at doing a merge against next-next
                     if !workingItem.isDataGap, next.keepnessScore < workingItem.keepnessScore {
-                        if let nextNext = next.nextItem, nextNext.keepnessScore > next.keepnessScore {
+                        if let nextNext = next.nextItem, !nextNext.isDataGap, nextNext.keepnessScore > next.keepnessScore {
                             nextNext.sanitiseEdges()
 
                             merges.insert(Merge(keeper: workingItem, betweener: next, deadman: nextNext))
@@ -82,7 +82,7 @@ public class TimelineProcessor {
 
                     // if previous has a lesser keepness, look at doing a merge against previous-previous
                     if !workingItem.isDataGap, previous.keepnessScore < workingItem.keepnessScore {
-                        if let prevPrev = previous.previousItem, prevPrev.keepnessScore > previous.keepnessScore {
+                        if let prevPrev = previous.previousItem, !prevPrev.isDataGap, prevPrev.keepnessScore > previous.keepnessScore {
                             prevPrev.sanitiseEdges()
 
                             merges.insert(Merge(keeper: workingItem, betweener: previous, deadman: prevPrev))