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

Backport DUDD calculation from 3.52

Browse Source
This commit is contained in:
Claude Brisson
2024-05-25 21:41:48 +02:00
parent 55aad8c3fa
commit 8a6def38a0
1 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -330,33 +330,17 @@ sealed class BaseSolver(
// Do nothing
} else if (scenario == 1) {
score += 1 * duddWeight
} else if (scenario == 2 || (scenario > 2 && !pairing.main.compensateDrawUpDown)) {
score += 2 * duddWeight
} else if (scenario == 3) {
} else if (scenario != 2 && (scenario <= 2 || pairing.main.compensateDrawUpDown)) {
if (scenario == 3) {
score += 3 * duddWeight
} else if (scenario == 4) {
score += 4 * duddWeight
}
/*if(p1.name == "Durand" && p2.name == "Aim") {
println("Names DU DD "+p1.nameSeed()+" "+p1_DU+" "+p1_DD+" "+p2.nameSeed()+" "+p2_DU+" "+p2_DD)
println("Names "+upperSP.nameSeed()+" "+upperSP.group+" "+lowerSP.nameSeed()+" "+lowerSP.group)
println("DUDD scenario, GroupDiff = "+scenario.toString()+" "+(upperSP.group-lowerSP.group).toString())
println("DUDD Upper/Lower modes = "+pairing.main.drawUpDownUpperMode.toString()+" "+pairing.main.drawUpDownLowerMode.toString())
println("u/lSPgroupsize = "+uSPgroupSize.toString()+" "+lSPgroupSize.toString())
println("u/lSPplaceingroup = "+upperSP.placeInGroup.first.toString()+" "+lowerSP.placeInGroup.first.toString())
println("score = " + score.toString())
}*/
} else {
score += 2 * duddWeight
}
// TODO adapt to Swiss with categories
/*// But, if players come from different categories, decrease score(added in 3.11)
val catGap: Int = Math.abs(p1.category(gps) - p2.category(gps))
score = score / (catGap + 1) / (catGap + 1) / (catGap + 1) / (catGap + 1)*/
}
if (score < 0.0) score = 0.0
return score
}