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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/linkgraph/mcf.cpp
This commit is contained in:
Jonathan G Rennison
2020-01-10 18:46:20 +00:00
parent 278ddc1f58 8b0e4bb101
commit c50ee4efec
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/linkgraph/mcf.cpp
View File

@@ -523,8 +523,7 @@ MCF1stPass::MCF1stPass(LinkGraphJob &job) : MultiCommodityFlow(job)
uint size = job.Size();
uint accuracy = job.Settings().accuracy;
bool more_loops;
std::vector<bool> finished_sources;
finished_sources.resize(size);
std::vector<bool> finished_sources(size);
do {
more_loops = false;
@@ -573,8 +572,7 @@ MCF2ndPass::MCF2ndPass(LinkGraphJob &job) : MultiCommodityFlow(job)
uint size = job.Size();
uint accuracy = job.Settings().accuracy;
bool demand_left = true;
std::vector<bool> finished_sources;
finished_sources.resize(size);
std::vector<bool> finished_sources(size);
while (demand_left && !job.IsJobAborted()) {
demand_left = false;
for (NodeID source = 0; source < size; ++source) {