gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-12 01:24:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r27612) -Codechange: Replace three uses of std::list with std::queue/vector. (JGR)

Browse Source
This commit is contained in:
fonsinchen 2016-07-10 11:57:16 +00:00
parent bcdae9a093
commit e2426b22fa
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/linkgraph/demands.cpp
View File

@ -2,11 +2,11 @@
#include "../stdafx.h"
#include "demands.h"
#include <list>
#include <queue>
#include "../safeguards.h"
typedef std::list<NodeID> NodeList;
typedef std::queue<NodeID> NodeList;
/**
* Scale various things according to symmetric/asymmetric distribution.
@ -172,11 +172,11 @@ void DemandCalculator::CalcDemand(LinkGraphJob &job, Tscaler scaler)
for (NodeID node = 0; node < job.Size(); node++) {
scaler.AddNode(job[node]);
if (job[node].Supply() > 0) {
supplies.push_back(node);
supplies.push(node);
num_supplies++;
}
if (job[node].Demand() > 0) {
demands.push_back(node);
demands.push(node);
num_demands++;
}
}
@ -191,17 +191,17 @@ void DemandCalculator::CalcDemand(LinkGraphJob &job, Tscaler scaler)
while (!supplies.empty() && !demands.empty()) {
NodeID from_id = supplies.front();
supplies.pop_front();
supplies.pop();
for (uint i = 0; i < num_demands; ++i) {
assert(!demands.empty());
NodeID to_id = demands.front();
demands.pop_front();
demands.pop();
if (from_id == to_id) {
/* Only one node with supply and demand left */
if (demands.empty() && supplies.empty()) return;
demands.push_back(to_id);
demands.push(to_id);
continue;
}
@ -236,7 +236,7 @@ void DemandCalculator::CalcDemand(LinkGraphJob &job, Tscaler scaler)
scaler.SetDemands(job, from_id, to_id, demand_forw);
if (scaler.HasDemandLeft(job[to_id])) {
demands.push_back(to_id);
demands.push(to_id);
} else {
num_demands--;
}
@ -245,7 +245,7 @@ void DemandCalculator::CalcDemand(LinkGraphJob &job, Tscaler scaler)
}
if (job[from_id].UndeliveredSupply() != 0) {
supplies.push_back(from_id);
supplies.push(from_id);
} else {
num_supplies--;
}

4
src/linkgraph/linkgraph_gui.h
View File

@ -17,7 +17,7 @@
#include "../widget_type.h"
#include "linkgraph_base.h"
#include <map>
#include <list>
#include <vector>
/**
* Properties of a link between two stations.
@ -39,7 +39,7 @@ class LinkGraphOverlay {
public:
typedef std::map<StationID, LinkProperties> StationLinkMap;
typedef std::map<StationID, StationLinkMap> LinkMap;
typedef std::list<std::pair<StationID, uint> > StationSupplyList;
typedef std::vector<std::pair<StationID, uint> > StationSupplyList;
static const uint8 LINK_COLOURS[];

4
src/linkgraph/refresh.h
View File

@ -14,7 +14,7 @@
#include "../cargo_type.h"
#include "../vehicle_base.h"
#include <list>
#include <vector>
#include <map>
#include <set>
@ -79,7 +79,7 @@ protected:
bool operator<(const Hop &other) const;
};
typedef std::list<RefitDesc> RefitList;
typedef std::vector<RefitDesc> RefitList;
typedef std::map<CargoID, uint> CapacitiesMap;
typedef std::set<Hop> HopSet;