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

Order occupancy: Add column to orders GUI to show occupancy running average.

Browse Source 
This is an exponentially weighted moving average of occupancies updated
when any vehicle in the shared order set leaves the station of that order.
The weighting factor is an adv setting.
This commit is contained in:
Jonathan G Rennison
2015-08-09 23:39:55 +01:00
parent a9200aa69a
commit 117599ec7f
11 changed files with 127 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/vehicle.cpp
View File

@@ -2115,6 +2115,28 @@ void Vehicle::LeaveStation()
SetBit(Train::From(this)->flags, VRF_LEAVING_STATION);
}
if (this->cur_real_order_index < this->GetNumOrders()) {
Order *real_current_order = this->GetOrder(this->cur_real_order_index);
uint current_occupancy = CalcPercentVehicleFilled(this, NULL);
uint old_occupancy = real_current_order->GetOccupancy();
uint new_occupancy;
if (old_occupancy == 0) {
new_occupancy = current_occupancy;
} else {
// Exponential weighted moving average using occupancy_smoothness
new_occupancy = (old_occupancy - 1) * _settings_game.order.occupancy_smoothness;
new_occupancy += current_occupancy * (100 - _settings_game.order.occupancy_smoothness);
new_occupancy += 50; // round to nearest integer percent, rather than just floor
new_occupancy /= 100;
}
if (new_occupancy + 1 != old_occupancy) {
real_current_order->SetOccupancy(static_cast<uint8>(new_occupancy + 1));
for (const Vehicle *v = this->FirstShared(); v != NULL; v = v->NextShared()) {
SetWindowDirty(WC_VEHICLE_ORDERS, v->index);
}
}
}
this->MarkDirty();
}