dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust link graph edge travel time updates in refresh mode

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-12-11 00:56:50 +00:00
parent 5c2d5782a4
commit 599b016c91
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/linkgraph/linkgraph.cpp
View File

@@ -238,12 +238,15 @@ void LinkGraph::Edge::Update(uint capacity, uint usage, uint32 travel_time, Edge
} else if (mode & EUM_REFRESH) { } else if (mode & EUM_REFRESH) {
/* If travel time is not provided, we scale the stored time based on /* If travel time is not provided, we scale the stored time based on
* the capacity increase. */ * the capacity increase. */
if (capacity > edge.capacity && travel_time == 0) { if (capacity > edge.capacity) {
edge.travel_time_sum = (edge.travel_time_sum / edge.capacity) * capacity; if (travel_time == 0) {
edge.travel_time_sum = (edge.travel_time_sum / edge.capacity) * capacity;
} else {
edge.travel_time_sum += (capacity - edge.capacity) * travel_time;
}
edge.capacity = capacity; edge.capacity = capacity;
} else { } else if (edge.travel_time_sum == 0) {
edge.capacity = std::max(edge.capacity, capacity); edge.travel_time_sum = travel_time * edge.capacity;
edge.travel_time_sum = std::max<uint64>(edge.travel_time_sum, travel_time * capacity);
} }
edge.usage = std::max(edge.usage, usage); edge.usage = std::max(edge.usage, usage);
} }