games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Merge pull request #4565 from kaja47/one-loop-less

Browse Source 
avoid one loop in BonusList::totalValue()
This commit is contained in:
Ivan Savenko 2024-09-05 15:05:48 +03:00 committed by GitHub
commit 2566576c95
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/bonuses/BonusList.cpp
View File

@ -104,8 +104,8 @@ int BonusList::totalValue() const
};
BonusCollection accumulated;
bool hasIndepMax = false;
bool hasIndepMin = false;
int indexMaxCount = 0;
int indexMinCount = 0;
std::array<int, vstd::to_underlying(BonusSource::NUM_BONUS_SOURCE)> percentToSource = {};
@ -141,12 +141,12 @@ int BonusList::totalValue() const
case BonusValueType::ADDITIVE_VALUE:
accumulated.additive += valModified;
break;
case BonusValueType::INDEPENDENT_MAX:
hasIndepMax = true;
case BonusValueType::INDEPENDENT_MAX: // actual meaning: at least this value
indexMaxCount++;
vstd::amax(accumulated.indepMax, valModified);
break;
case BonusValueType::INDEPENDENT_MIN:
hasIndepMin = true;
case BonusValueType::INDEPENDENT_MIN: // actual meaning: at most this value
indexMinCount++;
vstd::amin(accumulated.indepMin, valModified);
break;
}
@ -156,21 +156,18 @@ int BonusList::totalValue() const
accumulated.base += accumulated.additive;
auto valFirst = applyPercentage(accumulated.base ,accumulated.percentToAll);
if(hasIndepMin && hasIndepMax && accumulated.indepMin < accumulated.indepMax)
if(indexMinCount && indexMaxCount && 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)
{
return b->valType != BonusValueType::INDEPENDENT_MAX && b->valType != BonusValueType::INDEPENDENT_MIN;
}));
const int notIndepBonuses = bonuses.size() - indexMaxCount - indexMinCount;
if(notIndepBonuses)
return std::clamp(valFirst, accumulated.indepMax, accumulated.indepMin);
if (hasIndepMin)
if (indexMinCount)
return accumulated.indepMin;
if (hasIndepMax)
if (indexMaxCount)
return accumulated.indepMax;
return 0;