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

(svn r26166) -Fix: Scale flows only after mapping to avoid rounding errors.

Browse Source
This commit is contained in:
fonsinchen
2013-12-20 14:57:44 +00:00
parent 4818b72c75
commit ec492bfb77
5 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/linkgraph/flowmapper.cpp
View File

@@ -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) {