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

(svn r26646) -Fix [FS#6041]: Save locations instead of distances in link graphs to reduce size.

Browse Source
This commit is contained in:
fonsinchen
2014-06-14 13:35:39 +00:00
parent 3a49a63dd1
commit ef2caa02b2
7 changed files with 71 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/linkgraph/mcf.cpp
View File

@@ -259,7 +259,6 @@ void MultiCommodityFlow::Dijkstra(NodeID source_node, PathVector &paths)
for (NodeID to = iter.Next(); to != INVALID_NODE; to = iter.Next()) {
if (to == from) continue; // Not a real edge but a consumption sign.
Edge edge = this->job[from][to];
assert(edge.Distance() < UINT_MAX);
uint capacity = edge.Capacity();
if (this->max_saturation != UINT_MAX) {
capacity *= this->max_saturation;
@@ -267,7 +266,7 @@ void MultiCommodityFlow::Dijkstra(NodeID source_node, PathVector &paths)
if (capacity == 0) capacity = 1;
}
/* punish in-between stops a little */
uint distance = edge.Distance() + 1;
uint distance = DistanceMaxPlusManhattan(this->job[from].XY(), this->job[to].XY()) + 1;
Tannotation *dest = static_cast<Tannotation *>(paths[to]);
if (dest->IsBetter(source, capacity, capacity - edge.Flow(), distance)) {
annos.erase(dest);