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

Linkgraph: Handle non-integer multiple total demand in AsymmetricScalerEq

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-01-25 09:14:53 +00:00
parent dd99fd646d
commit 5b83e5ff78
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/linkgraph/demands.cpp
View File

@@ -103,6 +103,15 @@ public:
{ {
} }
/**
* Nothing to do here.
* @param unused.
* @param unused.
*/
inline void AdjustDemandNodes(LinkGraphJob &, const std::vector<NodeID> &)
{
}
/** /**
* Get the effective supply of one node towards another one. * Get the effective supply of one node towards another one.
* @param from The supplying node. * @param from The supplying node.
@@ -142,6 +151,21 @@ public:
inline void SetDemandPerNode(uint num_demands) inline void SetDemandPerNode(uint num_demands)
{ {
this->demand_per_node = CeilDiv(this->supply_sum, num_demands); this->demand_per_node = CeilDiv(this->supply_sum, num_demands);
this->missing_supply = (this->demand_per_node * num_demands) - this->supply_sum;
}
/**
* Adjust demand nodes after setting demand per node.
* @param job The link graph job.
* @param demands List of demand nodes to adjust.
*/
inline void AdjustDemandNodes(LinkGraphJob &job, const std::vector<NodeID> &demands)
{
const uint count = min<uint>(demands.size(), this->missing_supply);
this->missing_supply = 0;
for (uint i = 0; i < count; i++) {
job[demands[i]].ReceiveDemand(1);
}
} }
/** /**
@@ -171,6 +195,7 @@ public:
private: private:
uint supply_sum; ///< Sum of all supplies in the component. uint supply_sum; ///< Sum of all supplies in the component.
uint demand_per_node; ///< Mean demand associated with each node. uint demand_per_node; ///< Mean demand associated with each node.
uint missing_supply; ///< Suppply/demand adjustment for in AdjustDemandNodes.
}; };
/** /**
@@ -343,6 +368,7 @@ void DemandCalculator::CalcMinimisedDistanceDemand(LinkGraphJob &job, Tscaler sc
if (supplies.empty() || demands.empty()) return; if (supplies.empty() || demands.empty()) return;
scaler.SetDemandPerNode(demands.size()); scaler.SetDemandPerNode(demands.size());
scaler.AdjustDemandNodes(job, demands);
struct EdgeCandidate { struct EdgeCandidate {
NodeID from_id; NodeID from_id;