AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-25 21:03:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

performance: #10173 - Don't need to always create hashsets, don't need linked hash set

Browse Source
This commit is contained in:
Yair Morgenstern 2023-09-26 16:56:16 +03:00
parent d5dffa928a
commit 9c930347c3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/com/unciv/models/ruleset/validation/RulesetValidator.kt
View File

@ -595,7 +595,7 @@ class RulesetValidator(val ruleset: Ruleset) {
} }
private fun checkPromotionCircularReferences(lines: RulesetErrorList) { private fun checkPromotionCircularReferences(lines: RulesetErrorList) {
fun recursiveCheck(history: LinkedHashSet<Promotion>, promotion: Promotion, level: Int) { fun recursiveCheck(history: HashSet<Promotion>, promotion: Promotion, level: Int) {
if (promotion in history) { if (promotion in history) {
lines.add("Circular Reference in Promotions: ${history.joinToString("→") { it.name }}→${promotion.name}", lines.add("Circular Reference in Promotions: ${history.joinToString("→") { it.name }}→${promotion.name}",
RulesetErrorSeverity.Warning) RulesetErrorSeverity.Warning)
@ -605,11 +605,16 @@ class RulesetValidator(val ruleset: Ruleset) {
history.add(promotion) history.add(promotion)
for (prerequisiteName in promotion.prerequisites) { for (prerequisiteName in promotion.prerequisites) {
val prerequisite = ruleset.unitPromotions[prerequisiteName] ?: continue val prerequisite = ruleset.unitPromotions[prerequisiteName] ?: continue
recursiveCheck(history.toCollection(linkedSetOf()), prerequisite, level + 1) // Performance - if there's only one prerequisite, we can send this linked set as-is, since no one else will be using it
val linkedSetToPass =
if (promotion.prerequisites.size == 1) history
else history.toCollection(hashSetOf())
recursiveCheck(linkedSetToPass, prerequisite, level + 1)
} }
} }
for (promotion in ruleset.unitPromotions.values) { for (promotion in ruleset.unitPromotions.values) {
recursiveCheck(linkedSetOf(), promotion, 0) if (promotion.prerequisites.isEmpty()) continue
recursiveCheck(hashSetOf(), promotion, 0)
} }
} }