From f00cb4f968e0fb7050bae4145e1327e206e268e2 Mon Sep 17 00:00:00 2001 From: Joffrey Bion Date: Fri, 18 Jun 2021 00:18:53 +0200 Subject: Fix ex-aequo ranks When 2 players are ex-aequo, the rank of the next player is still supposed to take into account the 2 players in front of thim. So if 2 players are 2nd ex-aequo, the next guy is supposed to be 4th, not 3rd. --- .../kotlin/org/luxons/sevenwonders/model/score/Score.kt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'sw-common-model/src/commonMain/kotlin/org') diff --git a/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/score/Score.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/score/Score.kt index 36d0857f..9b0c5fb6 100644 --- a/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/score/Score.kt +++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/score/Score.kt @@ -4,18 +4,16 @@ import kotlinx.serialization.Serializable @Serializable data class ScoreBoard(val scores: List) { + init { + require(scores.sortedDescending() == scores) { "Scores must be sorted highest-to-lowest" } + } @OptIn(ExperimentalStdlibApi::class) val ranks: List - get() = buildList { - var r = 1 + get() = buildList { add(1) - for (i in 1..scores.lastIndex) { - if (scores[i] < scores[i - 1]) { - add(++r) - } else { - add(r) - } + scores.zipWithNext { prev, current -> current.compareTo(prev) == 0 }.forEach { exAequoWithPrev -> + add(if (exAequoWithPrev) last() else size + 1) } } } -- cgit