(svn r26549) -Change: better estimation for link capacities during full load

This commit is contained in:
fonsinchen
2014-05-01 14:50:52 +00:00
parent d5bd72296b
commit b8381b6b25
8 changed files with 98 additions and 74 deletions

View File

@@ -23,7 +23,7 @@
*/
class LinkRefresher {
public:
static void Run(Vehicle *v, bool allow_merge = true);
static void Run(Vehicle *v, bool allow_merge = true, bool is_full_loading = false);
protected:
/**
@@ -88,8 +88,9 @@ protected:
HopSet *seen_hops; ///< Hops already seen. If the same hop is seen twice we stop the algorithm. This is shared between all Refreshers of the same run.
CargoID cargo; ///< Cargo given in last refit order.
bool allow_merge; ///< If the refresher is allowed to merge or extend link graphs.
bool is_full_loading; ///< If the vehicle is full loading.
LinkRefresher(Vehicle *v, HopSet *seen_hops, bool allow_merge);
LinkRefresher(Vehicle *v, HopSet *seen_hops, bool allow_merge, bool is_full_loading);
void HandleRefit(const Order *next);
void ResetRefit();