Test MacMahon

2023-12-17 14:07:25 +01:00
parent 49973bdf23
commit a8e35a5ced
9 changed files with 7426 additions and 0 deletions
--- a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/solver/MacMahonSolver.kt
+++ b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/solver/MacMahonSolver.kt
@@ -23,6 +23,10 @@ class MacMahonSolver(round: Int,
    override val mainLimits get() = Pair(0.0, 100.0) // TODO
    override fun evalCriterion(pairable: Pairable, criterion: Criterion) = when (criterion) {
        Criterion.MMS -> pairable.mms
+        Criterion.SOSM -> pairable.sos
+        Criterion.SOSOSM -> pairable.sosos
+        Criterion.SOSMM1 -> pairable.sosm1
+        Criterion.SOSMM2 -> pairable.sosm2
        else -> super.evalCriterion(pairable, criterion)
    }