cpp/openttd-patchpack/source Changeset - r21351:95eabab86f13

Changeset - r21351:95eabab86f13

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

fonsinchen - 10 years ago 2014-04-08 19:28:14
fonsinchen@openttd.org

(svn r26448) -Fix [FS#5970]: Avoid division by 0 when scaling flow values.

2 files changed with 6 insertions and 2 deletions:

src/linkgraph/flowmapper.cpp

src/station_cmd.cpp

0 comments (0 inline, 0 general)

src/linkgraph/flowmapper.cpp

➞

Show inline comments

@@ @@ -49,8 +49,10 @@ void FlowMapper::Run(LinkGraphJob &job) @@
 		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();
 			/* Scale by time the graph has been running without being compressed. Add 1 to avoid
 			 * division by 0 if spawn date == last compression date. This matches
 			 * LinkGraph::Monthly(). */
 			uint runtime = job.JoinDate() - job.Settings().recalc_time - job.LastCompression() + 1;
 			for (FlowStatMap::iterator i = flows.begin(); i != flows.end(); ++i) {
 				i->second.ScaleToMonthly(runtime);
+			}

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -4314,9 +4314,11 @@ void FlowStat::ReleaseShare(StationID st @@
 /**
  * Scale all shares from link graph's runtime to monthly values.
  * @param runtime Time the link graph has been running without compression.
  * @pre runtime must be greater than 0 as we don't want infinite flow values.
  */
 void FlowStat::ScaleToMonthly(uint runtime)
+{
 	assert(runtime > 0);
 	SharesMap new_shares;
 	uint share = 0;
 	for (SharesMap::iterator i = this->shares.begin(); i != this->shares.end(); ++i) {

0 comments (0 inline, 0 general)