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

Reeng of solver classes, one little more tweak

Browse Source
This commit is contained in:
Claude Brisson
2023-06-20 13:22:28 +02:00
parent ec76d57045
commit 58b6b90af1
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,8 +52,8 @@ sealed class Solver(
open fun sort(p: Pairable, q: Pairable): Int { open fun sort(p: Pairable, q: Pairable): Int {
for (criterion in placement.criteria) { for (criterion in placement.criteria) {
val criterionP = evalCriterion(p, criterion) val criterionP = p.eval(criterion)
val criterionQ = evalCriterion(q, criterion) val criterionQ = q.eval(criterion)
if (criterionP != criterionQ) { if (criterionP != criterionQ) {
return (criterionP * 100 - criterionQ * 100).toInt() return (criterionP * 100 - criterionQ * 100).toInt()
} }
@@ -357,6 +357,7 @@ sealed class Solver(
val Pairable.sodos: Double get() = historyHelper.sodos[id]!! val Pairable.sodos: Double get() = historyHelper.sodos[id]!!
val Pairable.cums: Double get() = historyHelper.cumScore[id]!! val Pairable.cums: Double get() = historyHelper.cumScore[id]!!
fun Pairable.eval(criterion: Criterion) = evalCriterion(this, criterion)
open fun evalCriterion(pairable: Pairable, criterion: Criterion) = when (criterion) { open fun evalCriterion(pairable: Pairable, criterion: Criterion) = when (criterion) {
NONE -> 0.0 NONE -> 0.0
CATEGORY -> TODO() CATEGORY -> TODO()