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

Departure boards: Fix departure slot cache with multiple schedules

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-01-15 12:25:09 +00:00
parent 543433218c
commit 1ac6326306
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/departures.cpp
View File

@@ -33,6 +33,7 @@
#include "cargo_type.h" #include "cargo_type.h"
#include "departures_func.h" #include "departures_func.h"
#include "departures_type.h" #include "departures_type.h"
#include "3rdparty/cpp-btree/btree_set.h"
#include <map> #include <map>
#include <set> #include <set>
@@ -40,7 +41,7 @@
#include <algorithm> #include <algorithm>
/* A cache of used departure time for scheduled dispatch in departure time calculation */ /* A cache of used departure time for scheduled dispatch in departure time calculation */
typedef std::map<uint32, std::set<DateTicksScaled>> schdispatch_cache_t; typedef std::map<const DispatchSchedule *, btree::btree_set<DateTicksScaled>> schdispatch_cache_t;
/** A scheduled order. */ /** A scheduled order. */
typedef struct OrderDate typedef struct OrderDate
@@ -112,6 +113,8 @@ static inline bool VehicleSetNextDepartureTime(DateTicks *previous_departure, ui
/* -1 because this number is actually a moment before actual departure */ /* -1 because this number is actually a moment before actual departure */
} }
btree::btree_set<DateTicksScaled> &slot_cache = dept_schedule_last[&ds];
/* Find next available slots */ /* Find next available slots */
for (auto current_offset : ds.GetScheduledDispatch()) { for (auto current_offset : ds.GetScheduledDispatch()) {
if (current_offset >= dispatch_duration) continue; if (current_offset >= dispatch_duration) continue;
@@ -121,7 +124,7 @@ static inline bool VehicleSetNextDepartureTime(DateTicks *previous_departure, ui
} }
/* Make sure the slots has not already been used previously in this departure board calculation */ /* Make sure the slots has not already been used previously in this departure board calculation */
while (dept_schedule_last[v->orders.list->index].count(current_departure) > 0) { while (slot_cache.count(current_departure) > 0) {
current_departure += dispatch_duration; current_departure += dispatch_duration;
} }
@@ -132,7 +135,7 @@ static inline bool VehicleSetNextDepartureTime(DateTicks *previous_departure, ui
*waiting_time = order->GetWaitTime() + actual_departure - date_only_scaled - *previous_departure - order->GetTravelTime(); *waiting_time = order->GetWaitTime() + actual_departure - date_only_scaled - *previous_departure - order->GetTravelTime();
*previous_departure = actual_departure - date_only_scaled + order->GetWaitTime(); *previous_departure = actual_departure - date_only_scaled + order->GetWaitTime();
dept_schedule_last[v->orders.list->index].insert(actual_departure); slot_cache.insert(actual_departure);
/* Return true means that vehicle lateness should be clear from this point onward */ /* Return true means that vehicle lateness should be clear from this point onward */
return true; return true;