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

Add conditions to avoid division by 0 in weights

Browse Source
This commit is contained in:
Quentin Rendu
2023-09-26 09:08:38 +02:00
parent 7f50f9254c
commit 6fb675e75f
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/Solver.kt
View File

@@ -227,9 +227,11 @@ sealed class Solver(
var score = 0.0 var score = 0.0
val scoreRange: Int = groupsCount val scoreRange: Int = groupsCount
// TODO check category equality if category are used in SwissCat // TODO check category equality if category are used in SwissCat
val x = abs(p1.group - p2.group).toDouble() / scoreRange.toDouble() if (scoreRange!=0){
val k: Double = pairing.base.nx1 val x = abs(p1.group - p2.group).toDouble() / scoreRange.toDouble()
score = scoreWeight * (1.0 - x) * (1.0 + k * x) val k: Double = pairing.base.nx1
score = scoreWeight * (1.0 - x) * (1.0 + k * x)
}
logWeights("score", p1, p2, score) logWeights("score", p1, p2, score)
return score return score
@@ -304,6 +306,7 @@ sealed class Solver(
} else { } else {
0.0 0.0
} }
//println("countryRatio="+countryRatio.toString())
// Same club and club group (TODO club group) // Same club and club group (TODO club group)
var clubRatio = 0.0 var clubRatio = 0.0
@@ -334,13 +337,15 @@ sealed class Solver(
val secPart = min(countryRatio, clubRatio) val secPart = min(countryRatio, clubRatio)
var geoRatio = mainPart + secPart / 2.0 var geoRatio = mainPart + secPart / 2.0
if (geoRatio > 0.0) {
if (geoRatio > 0.0 && placementScoreRange != 0) {
geoRatio += 0.5 / placementScoreRange.toDouble() geoRatio += 0.5 / placementScoreRange.toDouble()
} }
// The concavity function is applied to geoRatio to get geoCost // The concavity function is applied to geoRatio to get geoCost
val dbGeoCost: Double = geoMaxCost.toDouble() * (1.0 - geoRatio) * (1.0 + pairing.base.nx1 * geoRatio) val dbGeoCost: Double = geoMaxCost.toDouble() * (1.0 - geoRatio) * (1.0 + pairing.base.nx1 * geoRatio)
var score = pairing.main.scoreWeight - dbGeoCost var score = pairing.main.scoreWeight - dbGeoCost
score = min(score, geoMaxCost) score = min(score, geoMaxCost)
return score return score