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

Do not select same bye player twice

Browse Source
This commit is contained in:
Quentin Rendu
2023-12-04 19:21:46 +01:00
parent 122db9347a
commit e446949c98
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ sealed class BaseSolver(
companion object { companion object {
val rand = Random(/* seed from properties - TODO */) val rand = Random(/* seed from properties - TODO */)
val DEBUG_EXPORT_WEIGHT = true val DEBUG_EXPORT_WEIGHT = true
var byePlayers: MutableList<Pairable> = mutableListOf()
} }
open fun openGothaWeight(p1: Pairable, p2: Pairable) = open fun openGothaWeight(p1: Pairable, p2: Pairable) =
@@ -68,6 +69,7 @@ sealed class BaseSolver(
var byePlayerIndex = 0 var byePlayerIndex = 0
for (p in nameSortedPairables){ for (p in nameSortedPairables){
weightForBye = p.rank + 2*p.main weightForBye = p.rank + 2*p.main
if (p in byePlayers) weightForBye += 1000
if (weightForBye <= minWeight){ if (weightForBye <= minWeight){
minWeight = weightForBye minWeight = weightForBye
chosenByePlayer = p chosenByePlayer = p
@@ -75,6 +77,7 @@ sealed class BaseSolver(
println("choose Bye: " + p.nameSeed() + " " + weightForBye) println("choose Bye: " + p.nameSeed() + " " + weightForBye)
} }
println("Bye player : " + chosenByePlayer.nameSeed()) println("Bye player : " + chosenByePlayer.nameSeed())
byePlayers.add(chosenByePlayer)
nameSortedPairables.remove(chosenByePlayer) nameSortedPairables.remove(chosenByePlayer)
} }
@@ -83,8 +86,8 @@ sealed class BaseSolver(
for (j in i + 1 until nameSortedPairables.size) { for (j in i + 1 until nameSortedPairables.size) {
val p = nameSortedPairables[i] val p = nameSortedPairables[i]
val q = nameSortedPairables[j] val q = nameSortedPairables[j]
weight(p, q).let { if (it != Double.NaN) builder.addEdge(p, q, it) } weight(p, q).let { if (it != Double.NaN) builder.addEdge(p, q, it/1.0) }
weight(q, p).let { if (it != Double.NaN) builder.addEdge(q, p, it) } weight(q, p).let { if (it != Double.NaN) builder.addEdge(q, p, it/1.0) }
if (DEBUG_EXPORT_WEIGHT) if (DEBUG_EXPORT_WEIGHT)
{ {
File(WEIGHTS_FILE).appendText("Player1Name="+p.nameSeed()+"\n") File(WEIGHTS_FILE).appendText("Player1Name="+p.nameSeed()+"\n")

1
api-webapp/src/test/kotlin/PairingTests.kt
View File

@@ -272,6 +272,7 @@ class PairingTests: TestBase() {
games = TestAPI.get("/api/tour/$id/res/$round").asArray() games = TestAPI.get("/api/tour/$id/res/$round").asArray()
} }
else { else {
//games = TestAPI.post("/api/tour/$id/pair/$round", Json.Array(playersList.filter{it != byePlayerList[round-1]})).asArray()
games = TestAPI.post("/api/tour/$id/pair/$round", Json.Array("all")).asArray() games = TestAPI.post("/api/tour/$id/pair/$round", Json.Array("all")).asArray()
logger.info("games for round $round: {}", games.toString()) logger.info("games for round $round: {}", games.toString())