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

Fix bug in missed rounds computation

Browse Source
This commit is contained in:
Claude Brisson
2024-01-30 16:31:07 +01:00
parent 727b341521
commit 9e3547fbd9
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/BasePairingHelper.kt
View File

@@ -92,7 +92,7 @@ abstract class BasePairingHelper(
val Pairable.sodos: Double get() = historyHelper.sodos[id] ?: 0.0 val Pairable.sodos: Double get() = historyHelper.sodos[id] ?: 0.0
val Pairable.cums: Double get() = historyHelper.cumScore[id] ?: 0.0 val Pairable.cums: Double get() = historyHelper.cumScore[id] ?: 0.0
fun Pairable.missedRounds(upToRound: Int, pairing: Set<ID>): Int = (1..upToRound).map { round -> fun Pairable.missedRounds(upToRound: Int, pairing: Set<ID>): Int = (1..upToRound).map { round ->
if (historyHelper.playersPerRound.getOrNull(round - 1)?.contains(id) == true || pairing.contains(id)) 0 else 1 if (historyHelper.playersPerRound.getOrNull(round - 1)?.contains(id) == true || round == upToRound && pairing.contains(id)) 0 else 1
}.sum() }.sum()
fun Pairable.eval(criterion: Criterion) = evalCriterion(this, criterion) fun Pairable.eval(criterion: Criterion) = evalCriterion(this, criterion)
open fun evalCriterion(pairable: Pairable, criterion: Criterion) = when (criterion) { open fun evalCriterion(pairable: Pairable, criterion: Criterion) = when (criterion) {

2
view-webapp/src/main/kotlin/org/jeudego/pairgoth/ratings/EGFRatingsHandler.kt
View File

@@ -19,6 +19,8 @@ object EGFRatingsHandler: RatingsHandler(RatingsManager.Ratings.EGF) {
}.toTypedArray() }.toTypedArray()
Json.MutableObject(*pairs).also { Json.MutableObject(*pairs).also {
it["origin"] = "EGF" it["origin"] = "EGF"
// override rank with rating equivalent
val rating = it["rating"]?.toString()?.toIntOrNull()
} }
} }
} }

2
view-webapp/src/main/webapp/index.html
View File

@@ -10,8 +10,6 @@
</div> </div>
<div class="tournaments section"> <div class="tournaments section">
#set($files = $api.get('tour')) #set($files = $api.get('tour'))
$log.info("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@")
$log.info($files)
#if($files.containsKey('error')) #if($files.containsKey('error'))
#set($error = $files.error) #set($error = $files.error)
#elseif($files.containsKey('message')) #elseif($files.containsKey('message'))