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

Fix sosos

Browse Source
This commit is contained in:
Claude Brisson
2024-03-10 20:19:41 +01:00
parent 4b6cfdb39d
commit 8d577f32ab
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/HistoryHelper.kt
View File

@@ -107,10 +107,10 @@ open class HistoryHelper(protected val history: List<List<Game>>, scoresGetter:
acc + next.second acc + next.second
}.mapValues { (id, score) -> }.mapValues { (id, score) ->
// "If the player does not participate in a round, the opponent's score is replaced by the starting score of the player himself." // "If the player does not participate in a round, the opponent's score is replaced by the starting score of the player himself."
score + playersPerRound.map { players -> score + playersPerRound.sumOf { players ->
if (players.contains(id)) 0.0 if (players.contains(id)) 0.0
else scores[id]?.first ?: 0.0 else scores[id]?.first ?: 0.0
}.sum() }
} }
} }
@@ -122,9 +122,13 @@ open class HistoryHelper(protected val history: List<List<Game>>, scoresGetter:
Pair(game.white, scores[game.black]?.second ?: 0.0) Pair(game.white, scores[game.black]?.second ?: 0.0)
}).groupBy { }).groupBy {
it.first it.first
}.mapValues { }.mapValues { (id, pairs) ->
val scores = it.value.map { it.second }.sorted() val oppScores = pairs.map { it.second }.sortedDescending()
scores.sum() - (scores.firstOrNull() ?: 0.0) oppScores.sum() - (oppScores.firstOrNull() ?: 0.0) +
playersPerRound.sumOf { players ->
if (players.contains(id)) 0.0
else scores[id]?.first ?: 0.0
}
} }
} }
@@ -136,9 +140,13 @@ open class HistoryHelper(protected val history: List<List<Game>>, scoresGetter:
Pair(game.white, scores[game.black]?.second ?: 0.0) Pair(game.white, scores[game.black]?.second ?: 0.0)
}).groupBy { }).groupBy {
it.first it.first
}.mapValues { }.mapValues { (id, pairs) ->
val scores = it.value.map { it.second }.sorted() val oppScores = pairs.map { it.second }.sorted()
scores.sum() - scores.getOrElse(0) { 0.0 } - scores.getOrElse(1) { 0.0 } oppScores.sum() - oppScores.getOrElse(0) { 0.0 } - oppScores.getOrElse(1) { 0.0 } +
playersPerRound.sumOf { players ->
if (players.contains(id)) 0.0
else scores[id]?.first ?: 0.0
}
} }
} }
@@ -159,6 +167,7 @@ open class HistoryHelper(protected val history: List<List<Game>>, scoresGetter:
// sosos // sosos
val sosos by lazy { val sosos by lazy {
val currentRound = history.size
(history.flatten().filter { game -> (history.flatten().filter { game ->
game.white != 0 // Remove games against byePlayer game.white != 0 // Remove games against byePlayer
}.map { game -> }.map { game ->
@@ -169,6 +178,11 @@ open class HistoryHelper(protected val history: List<List<Game>>, scoresGetter:
Pair(game.white, sos[game.black] ?: 0.0) Pair(game.white, sos[game.black] ?: 0.0)
}).groupingBy { it.first }.fold(0.0) { acc, next -> }).groupingBy { it.first }.fold(0.0) { acc, next ->
acc + next.second acc + next.second
}.mapValues { (id, sosos) ->
sosos + playersPerRound.sumOf { players ->
if (players.contains(id)) 0.0
else (scores[id]?.first ?: 0.0) * currentRound
}
} }
} }