diff options
| author | fonsinchen <fonsinchen@openttd.org> | 2013-12-20 14:57:44 +0000 |
|---|---|---|
| committer | fonsinchen <fonsinchen@openttd.org> | 2013-12-20 14:57:44 +0000 |
| commit | ec492bfb7700b719e41553417cbe77c5d10549ae (patch) | |
| tree | 3e32848d29e0a9326bb9ff373a2248fe7239ca68 /src/linkgraph/flowmapper.cpp | |
| parent | 4818b72c759f3845a28b94d3f1fad9541d4e8304 (diff) | |
| download | openttd-ec492bfb7700b719e41553417cbe77c5d10549ae.tar.xz | |
(svn r26166) -Fix: Scale flows only after mapping to avoid rounding errors.
Diffstat (limited to 'src/linkgraph/flowmapper.cpp')
| -rw-r--r-- | src/linkgraph/flowmapper.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/linkgraph/flowmapper.cpp b/src/linkgraph/flowmapper.cpp index b9aa9cd59..79e0f09f3 100644 --- a/src/linkgraph/flowmapper.cpp +++ b/src/linkgraph/flowmapper.cpp @@ -18,9 +18,6 @@ */ void FlowMapper::Run(LinkGraphJob &job) const { - /* Time the graph has been running without being compressed. */ - uint runtime = job.JoinDate() - job.Settings().recalc_time - job.LastCompression(); - for (NodeID node_id = 0; node_id < job.Size(); ++node_id) { Node prev_node = job[node_id]; StationID prev = prev_node.Station(); @@ -29,8 +26,6 @@ void FlowMapper::Run(LinkGraphJob &job) const Path *path = *i; uint flow = path->GetFlow(); if (flow == 0) break; - /* compress to monthly value */ - flow = max(1U, flow * 30 / runtime); Node node = job[path->GetNode()]; StationID via = node.Station(); StationID origin = job[path->GetOrigin()].Station(); @@ -51,7 +46,15 @@ void FlowMapper::Run(LinkGraphJob &job) const for (NodeID node_id = 0; node_id < job.Size(); ++node_id) { /* Remove local consumption shares marked as invalid. */ Node node = job[node_id]; - node.Flows().FinalizeLocalConsumption(node.Station()); + FlowStatMap &flows = node.Flows(); + flows.FinalizeLocalConsumption(node.Station()); + if (this->scale) { + /* Scale by time the graph has been running without being compressed. */ + uint runtime = job.JoinDate() - job.Settings().recalc_time - job.LastCompression(); + for (FlowStatMap::iterator i = flows.begin(); i != flows.end(); ++i) { + i->second.ScaleToMonthly(runtime); + } + } /* Clear paths. */ PathList &paths = node.Paths(); for (PathList::iterator i = paths.begin(); i != paths.end(); ++i) { |