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

Basic MMS computation

Browse Source
This commit is contained in:
Theo Barollet
2023-12-17 22:25:56 +01:00
parent f023d92259
commit e2c007e3b2
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api-webapp/src/main/kotlin/org/jeudego/pairgoth/model/Pairable.kt
View File

@@ -9,7 +9,7 @@ import org.jeudego.pairgoth.store.Store
sealed class Pairable(val id: ID, val name: String, open val rating: Int, open val rank: Int) { sealed class Pairable(val id: ID, val name: String, open val rating: Int, open val rank: Int) {
companion object { companion object {
val MIN_RANK: Int = -30 // 30k val MIN_RANK: Int = -30 // 30k
val MAX_RANK: Int = 20 val MAX_RANK: Int = 8 // 9D
} }
abstract fun toJson(): Json.Object abstract fun toJson(): Json.Object
abstract val club: String? abstract val club: String?

4
api-webapp/src/main/kotlin/org/jeudego/pairgoth/model/Pairing.kt
View File

@@ -181,8 +181,8 @@ class MacMahon(
placementParams: PlacementParams = PlacementParams( placementParams: PlacementParams = PlacementParams(
Criterion.NBW, Criterion.SOSW, Criterion.SOSOSW Criterion.NBW, Criterion.SOSW, Criterion.SOSOSW
), ),
var mmFloor: Int = -20, var mmFloor: Int = -20, // 20k
var mmBar: Int = 0 var mmBar: Int = 0 // 1D
): Pairing(MAC_MAHON, pairingParams, placementParams) { ): Pairing(MAC_MAHON, pairingParams, placementParams) {
companion object {} companion object {}
override fun pair(tournament: Tournament<*>, round: Int, pairables: List<Pairable>): List<Game> { override fun pair(tournament: Tournament<*>, round: Int, pairables: List<Pairable>): List<Game> {

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

@@ -236,8 +236,7 @@ sealed class BaseSolver(
open fun MainCritParams.minimizeScoreDifference(p1: Pairable, p2: Pairable): Double { open fun MainCritParams.minimizeScoreDifference(p1: Pairable, p2: Pairable): Double {
var score = 0.0 var score = 0.0
val scoreRange: Int = groupsCount val scoreRange: Int = groupsCount
// TODO check category equality if category are used in SwissCat if (scoreRange != 0){
if (scoreRange!=0){
val x = abs(p1.group - p2.group).toDouble() / scoreRange.toDouble() val x = abs(p1.group - p2.group).toDouble() / scoreRange.toDouble()
score = concavityFunction(x, scoreWeight) score = concavityFunction(x, scoreWeight)
} }

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

@@ -13,17 +13,18 @@ class MacMahonSolver(round: Int,
BaseSolver(round, history, pairables, pairingParams, placementParams) { BaseSolver(round, history, pairables, pairingParams, placementParams) {
override val scores: Map<ID, Double> by lazy { override val scores: Map<ID, Double> by lazy {
historyHelper.wins.mapValues { pairablesMap.mapValues { it.value.let {
pairablesMap[it.key]!!.let { pairable -> pairable -> pairable.mmBase + pairable.nbW // TODO take tournament parameter into account
pairable.mmBase + pairable.nbW } }
}
}
} }
val Pairable.mmBase: Double get() = min(max(rank, mmFloor), mmBar) + mmsZero val Pairable.mmBase: Double get() = min(max(rank, mmFloor), mmBar) + mmsZero
val Pairable.mms: Double get() = scores[id] ?: 0.0 val Pairable.mms: Double get() = scores[id] ?: 0.0
// CB TODO - configurable criteria // CB TODO - configurable criteria
override val mainLimits get() = Pair(mmFloor.toDouble(), 100.0) // TODO ? val mainScoreMin = mmFloor + PLA_SMMS_SCORE_MIN - Pairable.MIN_RANK
val mainScoreMax = mmBar + PLA_SMMS_SCORE_MAX + (round-1) - Pairable.MIN_RANK // round number starts at 1
override val mainLimits get() = Pair(mainScoreMin.toDouble(), mainScoreMax.toDouble())
override fun evalCriterion(pairable: Pairable, criterion: Criterion) = when (criterion) { override fun evalCriterion(pairable: Pairable, criterion: Criterion) = when (criterion) {
Criterion.MMS -> pairable.mms Criterion.MMS -> pairable.mms
Criterion.SOSM -> pairable.sos Criterion.SOSM -> pairable.sos
@@ -35,6 +36,8 @@ class MacMahonSolver(round: Int,
companion object { companion object {
const val mmsZero = 30.0 const val mmsZero = 30.0
const val PLA_SMMS_SCORE_MAX = 2 // TODO move this into placement criteria
const val PLA_SMMS_SCORE_MIN = -1
} }
} }