Siphalor/tweed5
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects 1 Releases Wiki Activity

Fix a cycle in the acyclic graph sorter

Browse Source
This commit is contained in:
Siphalor
2024-06-09 22:30:39 +02:00
parent b012955069
commit 3884485a0d
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tweed5-core/src/main/java/de/siphalor/tweed5/core/api/sort/AcyclicGraphSorter.java
View File

@@ -72,6 +72,9 @@ public class AcyclicGraphSorter {
break; break;
} }
if (!visitedIter.hasNext()) { if (!visitedIter.hasNext()) {
if (lastVisited == -1) {
break;
}
visitedIter.restart(); visitedIter.restart();
} }
} }

10
tweed5-core/src/test/java/de/siphalor/tweed5/core/impl/sort/AcyclicGraphSorterTest.java
View File

@@ -63,4 +63,14 @@ class AcyclicGraphSorterTest {
AcyclicGraphSorter.GraphCycleException exception = assertThrows(AcyclicGraphSorter.GraphCycleException.class, sorter::sort); AcyclicGraphSorter.GraphCycleException exception = assertThrows(AcyclicGraphSorter.GraphCycleException.class, sorter::sort);
assertEquals(Arrays.asList(2, 4, 5), exception.cycleIndeces()); assertEquals(Arrays.asList(2, 4, 5), exception.cycleIndeces());
} }
@Test
void minimalCycle() {
AcyclicGraphSorter sorter = new AcyclicGraphSorter(2);
sorter.addEdge(0, 1);
sorter.addEdge(1, 0);
AcyclicGraphSorter.GraphCycleException exception = assertThrows(AcyclicGraphSorter.GraphCycleException.class, sorter::sort);
assertEquals(Arrays.asList(0, 1), exception.cycleIndeces());
}
} }