浏览代码

further work on conflict detection

Eren Yilmaz 6 年之前
父节点
当前提交
676ebc9eac
共有 1 个文件被更改,包括 4 次插入6 次删除
  1. 4 6
      src/bk/ConflictDetection.java

+ 4 - 6
src/bk/ConflictDetection.java

@@ -112,13 +112,11 @@ public class ConflictDetection implements AlgorithmStage {
             break;
             break;
         case 11:
         case 11:
             hidden_k += 1;
             hidden_k += 1;
-            if (graph.getContainedLayers().get(i + 1).get(l).getSortedIncomingEdges().size() < hidden_k) {
-                k = graph.getContainedLayers().get(i).indexOf(graph.getContainedLayers().get(i + 1).get(l)
-                        .getSortedIncomingEdges().get(hidden_k).getSources().get(0));
-                pseudo_line += 1;
-            } else {
-                pseudo_line = 13;
+            if (k < k0 || k > k1) {
+                graph.getContainedLayers().get(i + 1).get(l).getSortedIncomingEdges().get(hidden_k).setConflicted(true,
+                        null);
             }
             }
+            pseudo_line = 10;
             break;
             break;
         }
         }