petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r25899) -Change: Restrict flows if links are restricted and don't normally pick them anymore.

Browse Source
This commit is contained in:
fonsinchen
2013-10-22 16:13:54 +00:00
parent 29e987f3fc
commit 6524849386
5 changed files with 164 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/station_base.h
View File

@@ -53,6 +53,7 @@ public:
{
assert(flow > 0);
this->shares[flow] = st;
this->unrestricted = flow;
}
/**
@@ -61,17 +62,23 @@ public:
* inconsistencies.
* @param st Remote station.
* @param flow Amount of flow to be added.
* @param restricted If the flow to be added is restricted.
*/
inline void AppendShare(StationID st, uint flow)
inline void AppendShare(StationID st, uint flow, bool restricted = false)
{
assert(flow > 0);
this->shares[(--this->shares.end())->first + flow] = st;
if (!restricted) this->unrestricted += flow;
}
uint GetShare(StationID st) const;
void ChangeShare(StationID st, int flow);
void RestrictShare(StationID st);
void ReleaseShare(StationID st);
/**
* Get the actual shares as a const pointer so that they can be iterated
* over.
@@ -79,24 +86,52 @@ public:
*/
inline const SharesMap *GetShares() const { return &this->shares; }
/**
* Return total amount of unrestricted shares.
* @return Amount of unrestricted shares.
*/
inline uint GetUnrestricted() const { return this->unrestricted; }
/**
* Swap the shares maps, and thus the content of this FlowStat with the
* other one.
* @param other FlowStat to swap with.
*/
inline void SwapShares(FlowStat &other) { this->shares.swap(other.shares); }
inline void SwapShares(FlowStat &other)
{
this->shares.swap(other.shares);
Swap(this->unrestricted, other.unrestricted);
}
/**
* Get a station a package can be routed to. This done by drawing a
* random number between 0 and sum_shares and then looking that up in
* the map with lower_bound. So each share gets selected with a
* probability dependent on its flow.
* probability dependent on its flow. Do include restricted flows here.
* @param is_restricted Output if a restricted flow was chosen.
* @return A station ID from the shares map.
*/
inline StationID GetViaWithRestricted(bool &is_restricted) const
{
assert(!this->shares.empty());
uint rand = RandomRange((--this->shares.end())->first);
is_restricted = rand >= this->unrestricted;
return this->shares.upper_bound(rand)->second;
}
/**
* Get a station a package can be routed to. This done by drawing a
* random number between 0 and sum_shares and then looking that up in
* the map with lower_bound. So each share gets selected with a
* probability dependent on its flow. Don't include restricted flows.
* @return A station ID from the shares map.
*/
inline StationID GetVia() const
{
assert(!this->shares.empty());
return this->shares.upper_bound(RandomRange((--this->shares.end())->first))->second;
return this->unrestricted > 0 ?
this->shares.upper_bound(RandomRange(this->unrestricted))->second :
INVALID_STATION;
}
StationID GetVia(StationID excluded, StationID excluded2 = INVALID_STATION) const;
@@ -105,6 +140,7 @@ public:
private:
SharesMap shares; ///< Shares of flow to be sent via specified station (or consumed locally).
uint unrestricted; ///< Limit for unrestricted shares.
};
/** Flow descriptions by origin stations. */
@@ -113,6 +149,8 @@ public:
void AddFlow(StationID origin, StationID via, uint amount);
void PassOnFlow(StationID origin, StationID via, uint amount);
void DeleteFlows(StationID via);
void RestrictFlows(StationID via);
void ReleaseFlows(StationID via);
void FinalizeLocalConsumption(StationID self);
};