nikola/pairgoth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix sos & co display

Browse Source
This commit is contained in:
Claude Brisson
2024-09-29 19:59:42 +02:00
parent 3b4bd61eb2
commit 0f7c6dfadf
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api-webapp/src/main/kotlin/org/jeudego/pairgoth/api/ApiTools.kt
View File

@@ -39,8 +39,13 @@ fun Tournament<*>.getSortedPairables(round: Int, includePreliminary: Boolean = f
// CB TODO - factorize history helper creation between here and solver classes // CB TODO - factorize history helper creation between here and solver classes
val historyHelper = HistoryHelper(historyBefore(round + 1)) { val historyHelper = HistoryHelper(historyBefore(round + 1)) {
if (pairing.type == PairingType.SWISS) wins.mapValues { Pair(0.0, it.value) } if (pairing.type == PairingType.SWISS) {
else pairables.mapValues { pairables.mapValues {
Pair(0.0, wins[it.key] ?: 0.0)
}
}
else {
pairables.mapValues {
it.value.let { pairable -> it.value.let { pairable ->
val mmBase = pairable.mmBase() val mmBase = pairable.mmBase()
val score = roundScore(mmBase + val score = roundScore(mmBase +
@@ -56,6 +61,7 @@ fun Tournament<*>.getSortedPairables(round: Int, includePreliminary: Boolean = f
} }
} }
} }
}
val neededCriteria = ArrayList(pairing.placementParams.criteria) val neededCriteria = ArrayList(pairing.placementParams.criteria)
if (!neededCriteria.contains(Criterion.NBW)) neededCriteria.add(Criterion.NBW) if (!neededCriteria.contains(Criterion.NBW)) neededCriteria.add(Criterion.NBW)
if (!neededCriteria.contains(Criterion.RATING)) neededCriteria.add(Criterion.RATING) if (!neededCriteria.contains(Criterion.RATING)) neededCriteria.add(Criterion.RATING)