gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-10 08:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: [Linkgraph] possible rounding errors for travel times of low-capacity links

Browse Source
This commit is contained in:
Nicolas Chappe 2021-11-13 20:49:35 +01:00 committed by Michael Lutz
parent 25b3ff6423
commit c5369caa45
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/linkgraph/linkgraph.cpp
View File

@ -72,12 +72,15 @@ void LinkGraph::Compress()
for (NodeID node2 = 0; node2 < this->Size(); ++node2) { for (NodeID node2 = 0; node2 < this->Size(); ++node2) {
BaseEdge &edge = this->edges[node1][node2]; BaseEdge &edge = this->edges[node1][node2];
if (edge.capacity > 0) { if (edge.capacity > 0) {
edge.capacity = std::max(1U, edge.capacity / 2); uint new_capacity = std::max(1U, edge.capacity / 2);
edge.usage /= 2; if (edge.capacity < (1 << 16)) {
} edge.travel_time_sum = edge.travel_time_sum * new_capacity / edge.capacity;
if (edge.travel_time_sum > 0) { } else if (edge.travel_time_sum != 0) {
edge.travel_time_sum = std::max(1ULL, edge.travel_time_sum / 2); edge.travel_time_sum = std::max(1ULL, edge.travel_time_sum / 2);
} }
edge.capacity = new_capacity;
edge.usage /= 2;
}
} }
} }
} }