|
@@ -112,13 +112,11 @@ public class ConflictDetection implements AlgorithmStage {
|
|
|
break;
|
|
|
case 11:
|
|
|
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;
|
|
|
}
|
|
|
|