games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Optimize BonusList::totalValue

Browse Source
This commit is contained in:
Ivan Savenko 2024-07-04 19:55:09 +00:00
parent 41ed7e2e10
commit ad972eb7e2
1 changed files with 50 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
lib/bonuses/BonusList.cpp
View File

@ -85,6 +85,9 @@ void BonusList::stackBonuses()
int BonusList::totalValue() const int BonusList::totalValue() const
{ {
if (bonuses.empty())
return 0;
struct BonusCollection struct BonusCollection
{ {
int base = 0; int base = 0;
@ -96,63 +99,65 @@ int BonusList::totalValue() const
int indepMax = std::numeric_limits<int>::min(); int indepMax = std::numeric_limits<int>::min();
}; };
auto percent = [](int64_t base, int64_t percent) -> int { auto percent = [](int base, int percent) -> int {
return static_cast<int>(std::clamp<int64_t>((base * (100 + percent)) / 100, std::numeric_limits<int>::min(), std::numeric_limits<int>::max())); return (static_cast<int64_t>(base) * (100 + percent)) / 100;
}; };
std::array <BonusCollection, vstd::to_underlying(BonusSource::NUM_BONUS_SOURCE)> sources = {};
BonusCollection any; BonusCollection accumulated;
bool hasIndepMax = false; bool hasIndepMax = false;
bool hasIndepMin = false; bool hasIndepMin = false;
std::array<int, vstd::to_underlying(BonusSource::NUM_BONUS_SOURCE)> percentToSource = {};
for(const auto & b : bonuses) for(const auto & b : bonuses)
{ {
switch(b->valType) switch(b->valType)
{ {
case BonusValueType::BASE_NUMBER:
sources[vstd::to_underlying(b->source)].base += b->val;
break;
case BonusValueType::PERCENT_TO_ALL:
sources[vstd::to_underlying(b->source)].percentToAll += b->val;
break;
case BonusValueType::PERCENT_TO_BASE:
sources[vstd::to_underlying(b->source)].percentToBase += b->val;
break;
case BonusValueType::PERCENT_TO_SOURCE: case BonusValueType::PERCENT_TO_SOURCE:
sources[vstd::to_underlying(b->source)].percentToSource += b->val; percentToSource[vstd::to_underlying(b->source)] += b->val;
break; break;
case BonusValueType::PERCENT_TO_TARGET_TYPE: case BonusValueType::PERCENT_TO_TARGET_TYPE:
sources[vstd::to_underlying(b->targetSourceType)].percentToSource += b->val; percentToSource[vstd::to_underlying(b->targetSourceType)] += b->val;
break;
}
}
for(const auto & b : bonuses)
{
int sourceIndex = vstd::to_underlying(b->source);
int valModified = percent(b->val, percentToSource[sourceIndex]);
switch(b->valType)
{
case BonusValueType::BASE_NUMBER:
accumulated.base += valModified;
break;
case BonusValueType::PERCENT_TO_ALL:
accumulated.percentToAll += valModified;
break;
case BonusValueType::PERCENT_TO_BASE:
accumulated.percentToBase += valModified;
break; break;
case BonusValueType::ADDITIVE_VALUE: case BonusValueType::ADDITIVE_VALUE:
sources[vstd::to_underlying(b->source)].additive += b->val; accumulated.additive += valModified;
break; break;
case BonusValueType::INDEPENDENT_MAX: case BonusValueType::INDEPENDENT_MAX:
hasIndepMax = true; hasIndepMax = true;
vstd::amax(sources[vstd::to_underlying(b->source)].indepMax, b->val); vstd::amax(accumulated.indepMax, valModified);
break; break;
case BonusValueType::INDEPENDENT_MIN: case BonusValueType::INDEPENDENT_MIN:
hasIndepMin = true; hasIndepMin = true;
vstd::amin(sources[vstd::to_underlying(b->source)].indepMin, b->val); vstd::amin(accumulated.indepMin, valModified);
break; break;
} }
} }
for(const auto & src : sources)
{
any.base += percent(src.base, src.percentToSource);
any.percentToBase += percent(src.percentToBase, src.percentToSource);
any.percentToAll += percent(src.percentToAll, src.percentToSource);
any.additive += percent(src.additive, src.percentToSource);
if(hasIndepMin)
vstd::amin(any.indepMin, percent(src.indepMin, src.percentToSource));
if(hasIndepMax)
vstd::amax(any.indepMax, percent(src.indepMax, src.percentToSource));
}
any.base = percent(any.base, any.percentToBase);
any.base += any.additive;
auto valFirst = percent(any.base ,any.percentToAll);
if(hasIndepMin && hasIndepMax && any.indepMin < any.indepMax) accumulated.base = percent(accumulated.base, accumulated.percentToBase);
any.indepMax = any.indepMin; accumulated.base += accumulated.additive;
auto valFirst = percent(accumulated.base ,accumulated.percentToAll);
if(hasIndepMin && hasIndepMax && accumulated.indepMin < accumulated.indepMax)
accumulated.indepMax = accumulated.indepMin;
const int notIndepBonuses = static_cast<int>(std::count_if(bonuses.cbegin(), bonuses.cend(), [](const std::shared_ptr<Bonus>& b) const int notIndepBonuses = static_cast<int>(std::count_if(bonuses.cbegin(), bonuses.cend(), [](const std::shared_ptr<Bonus>& b)
{ {
@ -160,9 +165,9 @@ int BonusList::totalValue() const
})); }));
if(notIndepBonuses) if(notIndepBonuses)
return std::clamp(valFirst, any.indepMax, any.indepMin); return std::clamp(valFirst, accumulated.indepMax, accumulated.indepMin);
return hasIndepMin ? any.indepMin : hasIndepMax ? any.indepMax : 0; return hasIndepMin ? accumulated.indepMin : hasIndepMax ? accumulated.indepMax : 0;
} }
std::shared_ptr<Bonus> BonusList::getFirst(const CSelector &select) std::shared_ptr<Bonus> BonusList::getFirst(const CSelector &select)