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

Add a test on name order in SeedCost for Split and Random

Browse Source
This commit is contained in:
Quentin Rendu
2023-12-20 10:29:13 +01:00
parent 56ee3f05a7
commit ae14e72871
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -377,7 +377,9 @@ sealed class BaseSolver(
SPLIT_AND_RANDOM -> { SPLIT_AND_RANDOM -> {
if ((2 * cla1 < groupSize && 2 * cla2 >= groupSize) || (2 * cla1 >= groupSize && 2 * cla2 < groupSize)) { if ((2 * cla1 < groupSize && 2 * cla2 >= groupSize) || (2 * cla1 >= groupSize && 2 * cla2 < groupSize)) {
val randRange = maxSeedingWeight * 0.2 val randRange = maxSeedingWeight * 0.2
val rand = detRandom(randRange, p1, p2) val rand: Double
if (p1.nameSeed() > p2.nameSeed()) {rand = detRandom(randRange, p2, p1)}
else {rand = detRandom(randRange, p1, p2)}
maxSeedingWeight - rand maxSeedingWeight - rand
} else { } else {
0.0 0.0

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

@@ -89,10 +89,13 @@ class PairingTests: TestBase() {
} }
fun compare_games(games:Json.Array, opengotha:Json.Array): Boolean{ fun compare_games(games:Json.Array, opengotha:Json.Array): Boolean{
if (games.size != opengotha.size) return false if (games.size != opengotha.size) {
val tmp = Game.fromJson(games.getJson(games.size-1)!!.asObject())
if ((tmp.white != 0) and (tmp.black != 0)) {return false}
}
val gamesPair = mutableSetOf<Pair<ID,ID>>() val gamesPair = mutableSetOf<Pair<ID,ID>>()
val openGothaPair = mutableSetOf<Pair<ID,ID>>() val openGothaPair = mutableSetOf<Pair<ID,ID>>()
for (i in 0 until games.size) { for (i in 0 until opengotha.size) {
val tmp = Game.fromJson(games.getJson(i)!!.asObject()) val tmp = Game.fromJson(games.getJson(i)!!.asObject())
gamesPair.add(Pair(tmp.white, tmp.black)) gamesPair.add(Pair(tmp.white, tmp.black))
val tmpOG = Game.fromJson(opengotha.getJson(i)!!.asObject()) val tmpOG = Game.fromJson(opengotha.getJson(i)!!.asObject())
@@ -246,7 +249,7 @@ class PairingTests: TestBase() {
var firstGameID: Int var firstGameID: Int
var playersList = mutableListOf<Long>() var playersList = mutableListOf<Long>()
var forcedPairingList = mutableListOf<Int>(1) var forcedPairingList = mutableListOf<Int>()
var forcedPairing = mutableListOf<Json>() var forcedPairing = mutableListOf<Json>()
var forcedGames: Json.Array var forcedGames: Json.Array
var game: Json var game: Json