Add score X standings parameter

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

@@ -34,7 +34,9 @@ fun Tournament<*>.getSortedPairables(round: Int): List<Json.Object> {
         else ceil(score - epsilon)
     }
 
-    val historyHelper = HistoryHelper(historyBefore(round + 1)) {
+    val historyHelper = HistoryHelper(
+        historyBefore(round + 1),
+        scoresGetter = {
         if (pairing.type == PairingType.SWISS) wins.mapValues { Pair(0.0, it.value) }
         else pairables.mapValues {
             it.value.let { pairable ->
@@ -51,7 +53,16 @@ fun Tournament<*>.getSortedPairables(round: Int): List<Json.Object> {
                 )
             }
         }
-    }
+    },
+        scoresXGetter = {
+            if (pairing.type == PairingType.SWISS) wins.mapValues { it.value }
+            else pairables.mapValues {
+                it.value.let { pairable ->
+                    roundScore(pairable.mmBase() + (nbW(pairable) ?: 0.0))
+                }
+            }
+        }
+    )
     val neededCriteria = ArrayList(pairing.placementParams.criteria)
     if (!neededCriteria.contains(Criterion.NBW)) neededCriteria.add(Criterion.NBW)
     if (!neededCriteria.contains(Criterion.RATING)) neededCriteria.add(Criterion.RATING)
@@ -63,6 +74,7 @@ fun Tournament<*>.getSortedPairables(round: Int): List<Json.Object> {
             Criterion.RATING -> pairables.mapValues { it.value.rating }
             Criterion.NBW -> historyHelper.wins
             Criterion.MMS -> historyHelper.mms
+            Criterion.SCOREX -> historyHelper.scoresX
             Criterion.STS -> StandingsHandler.nullMap
             Criterion.CPS -> StandingsHandler.nullMap
 

api-webapp/src/main/kotlin/org/jeudego/pairgoth/model/Placement.kt

@@ -12,6 +12,7 @@ enum class Criterion {
     MMS, // Macmahon score
     STS, // Strasbourg score
     CPS, // Cup score
+    SCOREX, // CB TODO - I'm adding this one for the congress, didn't find its name in OG after a quick check, needs a deeper investigation
 
     SOSW, // Sum of opponents NBW
     SOSWM1, //-1

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

@@ -13,11 +13,12 @@ abstract class BasePairingHelper(
     ) {
 
     abstract val scores: Map<ID, Pair<Double, Double>>
+    abstract val scoresX: Map<ID, Double>
     val historyHelper =
         if (pairables.first().let { it is TeamTournament.Team && it.teamOfIndividuals }) TeamOfIndividualsHistoryHelper(
             history
         ) { scores }
-        else HistoryHelper(history) { scores }
+        else HistoryHelper(history, scoresGetter = { scores }, scoresXGetter = { scoresX })
 
     // Extend pairables with members from all rounds
 

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

@@ -3,7 +3,15 @@ package org.jeudego.pairgoth.pairing
 import org.jeudego.pairgoth.model.*
 import org.jeudego.pairgoth.model.Game.Result.*
 
-open class HistoryHelper(protected val history: List<List<Game>>, scoresGetter: HistoryHelper.()-> Map<ID, Pair<Double, Double>>) {
+open class HistoryHelper(
+    protected val history: List<List<Game>>,
+    // scoresGetter() returns Pair(absentSosValueForOthers, score) where score is nbw for Swiss, mms for MM, ...
+    scoresGetter: HistoryHelper.()-> Map<ID, Pair<Double, Double>>,
+    // scoresXGetter(), defined by default as score
+    scoresXGetter: HistoryHelper.()-> Map<ID, Double> = {
+            scoresGetter().mapValues { entry -> entry.value.second
+        }
+}) {
 
     // List of all the pairables ID present in the history
     val allPairables = history.flatten()
@@ -24,6 +32,10 @@ open class HistoryHelper(protected val history: List<List<Game>>, scoresGetter:
         scoresGetter()
     }
 
+    val scoresX by lazy {
+        scoresXGetter()
+    }
+
     // Generic helper functions
     open fun playedTogether(p1: Pairable, p2: Pairable) = paired.contains(Pair(p1.id, p2.id))
     open fun colorBalance(p: Pairable) = colorBalance[p.id]

api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/solver/MacMahonSolver.kt

@@ -33,6 +33,15 @@ class MacMahonSolver(round: Int,
         }
     }
 
+    override val scoresX: Map<ID, Double> by lazy {
+        require (mmBar > mmFloor) { "MMFloor is higher than MMBar" }
+        pairablesMap.mapValues {
+            it.value.let { pairable ->
+                roundScore(pairable.mmBase + pairable.nbW)
+            }
+        }
+    }
+
     override fun computeWeightForBye(p: Pairable): Double{
         return 2*scores[p.id]!!.second
     }
@@ -76,6 +85,7 @@ class MacMahonSolver(round: Int,
     val Pairable.mmBase: Double get() = min(max(rank, mmFloor), mmBar) + mmsZero + mmsCorrection
     // mms: current Mac-Mahon score of the pairable
     val Pairable.mms: Double get() = scores[id]?.second ?: 0.0
+    val Pairable.scoreX: Double get() = scoresX[id] ?: 0.0
 
     // CB TODO - configurable criteria
     val mainScoreMin = mmFloor + PLA_SMMS_SCORE_MIN - Pairable.MIN_RANK
@@ -83,6 +93,7 @@ class MacMahonSolver(round: Int,
     override val mainLimits get() = Pair(mainScoreMin.toDouble(), mainScoreMax.toDouble())
     override fun evalCriterion(pairable: Pairable, criterion: Criterion) = when (criterion) {
         Criterion.MMS -> pairable.mms
+        Criterion.SCOREX -> pairable.scoreX
         Criterion.SOSM -> pairable.sos
         Criterion.SOSOSM -> pairable.sosos
         Criterion.SOSMM1 -> pairable.sosm1

api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/solver/SwissSolver.kt

@@ -20,8 +20,7 @@ class SwissSolver(round: Int,
         historyHelper.wins.mapValues {
             Pair(0.0, it.value) }
     }
-    //
-    // get() by lazy { historyHelper.wins }
+    override val scoresX: Map<ID, Double> get() = scores.mapValues { it.value.second }
 
     override val mainLimits = Pair(0.0, round - 1.0)
 }

view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/PairgothTool.kt

@@ -26,6 +26,7 @@ class PairgothTool {
         "RATING" to "Rating",
         "NBW" to "Number of wins", // Number win
         "MMS" to "Mac Mahon score", // Macmahon score
+        "SCOREX" to "Score X", // Score X
         // TODO "STS" to "Strasbourg score", // Strasbourg score
         // TODO "CPS" to "Cup score", // Cup score