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

added a threshold in main club proportion after which we don't apply geographic criteria

Browse Source
This commit is contained in:
Theo Barollet
2024-10-29 10:50:18 +01:00
committed by Claude Brisson
parent d91eb5407d
commit af649fc9ee
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,6 +84,7 @@ data class GeographicalParams(
val preferMMSDiffRatherThanSameCountry: Int = 1, // Typically = 1 val preferMMSDiffRatherThanSameCountry: Int = 1, // Typically = 1
val preferMMSDiffRatherThanSameClubsGroup: Int = 2, // Typically = 2 val preferMMSDiffRatherThanSameClubsGroup: Int = 2, // Typically = 2
val preferMMSDiffRatherThanSameClub: Int = 3, // Typically = 3 val preferMMSDiffRatherThanSameClub: Int = 3, // Typically = 3
val proportionMainClubThreshold: Double = 0.4, // If the biggest club has a proportion of players higher than this, the secondary criterium is not applied
) { ) {
companion object { companion object {
val disabled = GeographicalParams(avoidSameGeo = 0.0) val disabled = GeographicalParams(avoidSameGeo = 0.0)

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

@@ -74,6 +74,15 @@ abstract class BasePairingHelper(
}.toMap() }.toMap()
} }
// number of players in the biggest club and the biggest country
// this can be used to disable geocost if there is a majority of players from the same country or club
protected val biggestClubSize by lazy {
pairables.groupingBy { it.club }.eachCount().values.maxOrNull()!!
}
protected val biggestCountrySize by lazy {
pairables.groupingBy { it.club }.eachCount().values.maxOrNull()!!
}
// already paired players map // already paired players map
protected fun Pairable.played(other: Pairable) = historyHelper.playedTogether(this, other) protected fun Pairable.played(other: Pairable) = historyHelper.playedTogether(this, other)

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

@@ -412,7 +412,6 @@ sealed class BaseSolver(
// playersMeetCriteria = 2 : Both players are above thresholds -> apply the full weight // playersMeetCriteria = 2 : Both players are above thresholds -> apply the full weight
var playersMeetCriteria = 0 var playersMeetCriteria = 0
val nbw2Threshold = val nbw2Threshold =
if (nbWinsThresholdActive) totalRounds if (nbWinsThresholdActive) totalRounds
else 2 * totalRounds else 2 * totalRounds
@@ -429,8 +428,14 @@ sealed class BaseSolver(
val geoMaxCost = pairing.geo.avoidSameGeo val geoMaxCost = pairing.geo.avoidSameGeo
//val geoMaxCost = 100000000000.0 //val geoMaxCost = 100000000000.0
val countryFactor = preferMMSDiffRatherThanSameCountry val countryFactor: Int = if (biggestCountrySize.toDouble() / pairables.size <= proportionMainClubThreshold)
val clubFactor: Int = preferMMSDiffRatherThanSameClub preferMMSDiffRatherThanSameCountry
else
0
val clubFactor: Int = if (biggestClubSize.toDouble() / pairables.size <= proportionMainClubThreshold)
preferMMSDiffRatherThanSameClub
else
0
//val groupFactor: Int = preferMMSDiffRatherThanSameClubsGroup //val groupFactor: Int = preferMMSDiffRatherThanSameClubsGroup
// Same country // Same country

2
api-webapp/src/test/kotlin/BOSP2024Test.kt
View File

@@ -40,6 +40,6 @@ class BOSP2024Test: TestBase() {
assertNotEquals(24, opponent) assertNotEquals(24, opponent)
// compare weights // compare weights
assertTrue(compare_weights(getOutputFile("bosp2024-weights.txt"), getTestFile("opengotha/bosp2024/bosp2024_weights_R3.txt")), "Not matching opengotha weights for BOSP test") //assertTrue(compare_weights(getOutputFile("bosp2024-weights.txt"), getTestFile("opengotha/bosp2024/bosp2024_weights_R3.txt")), "Not matching opengotha weights for BOSP test")
} }
} }