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

Use mmBase for the starting Mac-Mahon score in secondary criteria

Browse Source
This commit is contained in:
Quentin Rendu
2024-05-29 13:16:50 +02:00
committed by Claude Brisson
parent d26f0ea010
commit 4404058148
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,12 +49,12 @@ class MacMahonSolver(round: Int,
// subtract Pairable.MIN_RANK to thresholds to convert ranks to MMS score // subtract Pairable.MIN_RANK to thresholds to convert ranks to MMS score
if (2 * p1.nbW >= nbw2Threshold if (2 * p1.nbW >= nbw2Threshold
// check if STARTING MMS is above MM bar (OpenGotha v3.52 behavior) // check if STARTING MMS is above MM bar (OpenGotha v3.52 behavior)
|| barThresholdActive && ((p1.mms-p1.nbW) >= mmBar - Pairable.MIN_RANK) || barThresholdActive && (p1.mmBase >= mmBar - Pairable.MIN_RANK)
|| p1.mms >= rankSecThreshold - Pairable.MIN_RANK) playersMeetCriteria++ || p1.mms >= rankSecThreshold - Pairable.MIN_RANK) playersMeetCriteria++
if (2 * p2.nbW >= nbw2Threshold if (2 * p2.nbW >= nbw2Threshold
// check if STARTING MMS is above MM bar (OpenGotha v3.52 behavior) // check if STARTING MMS is above MM bar (OpenGotha v3.52 behavior)
|| barThresholdActive && ((p2.mms-p2.nbW) >= mmBar - Pairable.MIN_RANK) || barThresholdActive && (p2.mmBase >= mmBar - Pairable.MIN_RANK)
|| p2.mms >= rankSecThreshold - Pairable.MIN_RANK) playersMeetCriteria++ || p2.mms >= rankSecThreshold - Pairable.MIN_RANK) playersMeetCriteria++
return pairing.geo.apply(p1, p2, playersMeetCriteria) return pairing.geo.apply(p1, p2, playersMeetCriteria)
@@ -68,7 +68,9 @@ class MacMahonSolver(round: Int,
} }
} }
// mmBase: starting Mac-Mahon score of the pairable
val Pairable.mmBase: Double get() = min(max(rank, mmFloor), mmBar) + mmsZero + mmsCorrection 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.mms: Double get() = scores[id]?.second ?: 0.0
// CB TODO - configurable criteria // CB TODO - configurable criteria