Miko/baritone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed size calculation in optimizeForestEdges()

Browse Source 
This fixes the code in ConnGraph.optimizeForestEdges() that computes the resulting size after combining two Euler tour trees into one. Technically, the old behavior was still correct, but only by accident; this change is still kind of a bug fix.
This commit is contained in:
William Jacobs
2019-03-18 13:21:26 -04:00
parent 05d678a189
commit 458cdd3ddd
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/github/btrekkie/connectivity/ConnGraph.java
View File

@@ -1073,20 +1073,21 @@ public class ConnGraph {
EulerTourVertex lowerVertex1 = vertex;
EulerTourVertex lowerVertex2 = edge.vertex2;
for (int lowerLevel = level - 1; lowerLevel > 0; lowerLevel--) {
int size = 0;
// Compute the total size if we combine the Euler tour trees
int combinedSize = 1;
if (lowerVertex1.lowerVertex != null) {
size = lowerVertex1.lowerVertex.arbitraryVisit.root().size;
combinedSize += lowerVertex1.lowerVertex.arbitraryVisit.root().size;
} else {
size = 1;
combinedSize++;
}
if (lowerVertex2.lowerVertex != null) {
size += lowerVertex2.lowerVertex.arbitraryVisit.root().size;
combinedSize += lowerVertex2.lowerVertex.arbitraryVisit.root().size;
} else {
size++;
combinedSize++;
}
// X EulerTourVertices = (2 * X - 1) EulerTourNodes
if (size > 2 * (1 << lowerLevel) - 1) {
if (combinedSize > 2 * (1 << lowerLevel) - 1) {
break;
}