Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Added safeguard against generating invalid selection weight data in Trinity::Containers::SelectRandomWeightedContainerElement

Browse Source
This commit is contained in:
Shauren
2016-01-23 11:34:47 +01:00
parent 55bfd2d738
commit d5b0ffbe9b
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/Utilities/Containers.h
View File

@@ -75,7 +75,8 @@ namespace Trinity
* Select a random element from a container where each element has a different chance to be selected.
*
* @param container Container to select an element from
* @param weights Chances of each element to be selected, must be in the same order as elements in container
* @param weights Chances of each element to be selected, must be in the same order as elements in container.
* Caller is responsible for checking that sum of all weights is greater than 0.
*
* Note: container cannot be empty
*/
@@ -102,7 +103,16 @@ namespace Trinity
{
std::vector<double> weights;
weights.reserve(container.size());
std::transform(container.begin(), container.end(), std::back_inserter(weights), weightExtractor);
double weightSum = 0.0;
for (auto itr = container.begin(); itr != container.end(); ++itr)
{
double weight = weightExtractor(*itr);
weights.push_back(weight);
weightSum += weight;
}
if (weightSum <= 0.0)
weights.assign(container.size(), 1.0);
return SelectRandomWeightedContainerElement(container, weights);
}