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

Link graph: Clamp job duration multipliers to 1 for small jobs

Browse Source 
Cost estimate < 4000
This commit is contained in:
Jonathan G Rennison
2019-02-22 00:56:04 +00:00
parent e3bb96e484
commit 26858cdf3d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/linkgraph/linkgraphschedule.cpp
View File

@@ -73,7 +73,7 @@ void LinkGraphSchedule::SpawnNext()
uint64 cost = lg->CalculateCostEstimate(); uint64 cost = lg->CalculateCostEstimate();
used_budget += cost; used_budget += cost;
if (LinkGraphJob::CanAllocateItem()) { if (LinkGraphJob::CanAllocateItem()) {
uint duration_multiplier = CeilDivT<uint64_t>(scaling * cost, total_cost); uint duration_multiplier = cost < 4000 ? 1 : CeilDivT<uint64_t>(scaling * cost, total_cost);
std::unique_ptr<LinkGraphJob> job(new LinkGraphJob(*lg, duration_multiplier)); std::unique_ptr<LinkGraphJob> job(new LinkGraphJob(*lg, duration_multiplier));
jobs_to_execute.emplace_back(job.get(), cost); jobs_to_execute.emplace_back(job.get(), cost);
if (this->running.empty() || job->JoinDateTicks() >= this->running.back()->JoinDateTicks()) { if (this->running.empty() || job->JoinDateTicks() >= this->running.back()->JoinDateTicks()) {