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

Link graph: Explicitly flag invalidated flow stats instead of minimising their flows

Browse Source 
Entirely exclude invalidated flow stats from link stats

Delete invalidated flow stats if they stay invalid for 32 link graph jobs

This is to prevent large numbers of invalidated flow stats from
unduly influencing link statistics
This commit is contained in:
Jonathan G Rennison
2019-10-20 07:46:21 +01:00
parent 115af44f3a
commit b6e9817edb
7 changed files with 101 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/station_cmd.cpp
View File

@@ -4713,22 +4713,6 @@ StationID FlowStat::GetVia(StationID excluded, StationID excluded2) const
return it3->second;
}
/**
* Reduce all flows to minimum capacity so that they don't get in the way of
* link usage statistics too much. Keep them around, though, to continue
* routing any remaining cargo.
*/
void FlowStat::Invalidate()
{
assert(!this->empty());
uint i = 0;
for (iterator it(this->begin()); it != this->end(); ++it) {
if (it->first == this->unrestricted) this->unrestricted = i + 1;
it->first = ++i;
}
assert(!this->empty() && this->unrestricted <= (this->end() - 1)->first);
}
/**
* Change share for specified station. By specifying INT_MIN as parameter you
* can erase a share. Newly added flows will be unrestricted.
@@ -4950,6 +4934,7 @@ uint FlowStatMap::GetFlow() const
{
uint ret = 0;
for (FlowStatMap::const_iterator i = this->begin(); i != this->end(); ++i) {
if (i->IsInvalid()) continue;
ret += (i->end() - 1)->first;
}
return ret;
@@ -4964,6 +4949,7 @@ uint FlowStatMap::GetFlowVia(StationID via) const
{
uint ret = 0;
for (FlowStatMap::const_iterator i = this->begin(); i != this->end(); ++i) {
if (i->IsInvalid()) continue;
ret += i->GetShare(via);
}
return ret;
@@ -4978,6 +4964,7 @@ uint FlowStatMap::GetFlowFrom(StationID from) const
{
FlowStatMap::const_iterator i = this->find(from);
if (i == this->end()) return 0;
if (i->IsInvalid()) return 0;
return (i->end() - 1)->first;
}
@@ -4991,6 +4978,7 @@ uint FlowStatMap::GetFlowFromVia(StationID from, StationID via) const
{
FlowStatMap::const_iterator i = this->find(from);
if (i == this->end()) return 0;
if (i->IsInvalid()) return 0;
return i->GetShare(via);
}
@@ -5010,12 +4998,14 @@ void FlowStatMap::SortStorage()
void DumpStationFlowStats(char *b, const char *last)
{
btree::btree_map<uint, uint> count_map;
btree::btree_map<uint, uint> invalid_map;
const Station *st;
FOR_ALL_STATIONS(st) {
for (CargoID i = 0; i < NUM_CARGO; i++) {
const GoodsEntry &ge = st->goods[i];
for (FlowStatMap::const_iterator it(ge.flows.begin()); it != ge.flows.end(); ++it) {
count_map[(uint32)it->size()]++;
invalid_map[it->GetRawFlags() & 0x1F]++;
}
}
}
@@ -5023,6 +5013,10 @@ void DumpStationFlowStats(char *b, const char *last)
for (const auto &it : count_map) {
b += seprintf(b, last, "%-5u %-5u\n", it.first, it.second);
}
b += seprintf(b, last, "Flow state shares invalid state distribution:\n");
for (const auto &it : invalid_map) {
b += seprintf(b, last, "%-2u %-5u\n", it.first, it.second);
}
}
extern const TileTypeProcs _tile_type_station_procs = {