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

clean before merge

Browse Source
This commit is contained in:
Theo Barollet
2024-01-23 19:22:56 +01:00
parent b4a928b894
commit 08d6ecd6ca
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,9 +184,6 @@ sealed class BaseSolver(
// This cost is never applied if potential Handicap != 0
// It is fully applied if wbBalance(sP1) and wbBalance(sP2) are strictly of different signs
// It is half applied if one of wbBalance is 0 and the other is >=2
if (p1.name == "Marechal" && p2.name == "Goloubkov") {
println("coucou ${p1.colorBalance} ${p2.colorBalance}")
}
val hd1 = pairing.handicap.handicap(p1, p2)
val hd2 = pairing.handicap.handicap(p2, p1)
val potentialHd: Int = max(hd1, hd2)
@@ -197,9 +194,8 @@ sealed class BaseSolver(
else if (wb1 == 0 && abs(wb2) >= 2 || wb2 == 0 && abs(wb1) >= 2) colorBalanceWeight / 2 else 0.0
} else {
// apply a *big* score to let the stronger player have white
//if (hd2 == 0) colorBalanceWeight * 10
//else 0.0
0.0
if (hd2 == 0) colorBalanceWeight * 10
else 0.0
}
return score
}
@@ -423,8 +419,8 @@ sealed class BaseSolver(
fun GeographicalParams.apply(p1: Pairable, p2: Pairable): Double {
val placementScoreRange = groupsCount
//val geoMaxCost = pairing.geo.avoidSameGeo
val geoMaxCost = 100000000000.0
val geoMaxCost = pairing.geo.avoidSameGeo
//val geoMaxCost = 100000000000.0
val countryFactor = preferMMSDiffRatherThanSameCountry
val clubFactor: Int = preferMMSDiffRatherThanSameClub