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

Symmetric detRandom for pairings, asymmetric for colour

Browse Source
This commit is contained in:
Quentin Rendu
2025-01-14 10:43:50 +01:00
committed by Claude Brisson
parent b66b577077
commit cbdb8b1f52
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@ package org.jeudego.pairgoth.pairing
import org.jeudego.pairgoth.model.Pairable import org.jeudego.pairgoth.model.Pairable
import org.jeudego.pairgoth.pairing.solver.BaseSolver import org.jeudego.pairgoth.pairing.solver.BaseSolver
fun detRandom(max: Double, p1: Pairable, p2: Pairable): Double { fun detRandom(max: Double, p1: Pairable, p2: Pairable, symmetric: Boolean): Double {
var inverse = false var inverse = false
var name1 = p1.fullName("") var name1 = p1.fullName("")
var name2 = p2.fullName("") var name2 = p2.fullName("")
@@ -15,7 +15,8 @@ fun detRandom(max: Double, p1: Pairable, p2: Pairable): Double {
c.code.toDouble() * (i + 1) c.code.toDouble() * (i + 1)
}.sum() * 1234567 % (max + 1) }.sum() * 1234567 % (max + 1)
// we want the symmetry, except when explicitly asked for a legacy asymmetric detRandom, for tests // we want the symmetry, except when explicitly asked for a legacy asymmetric detRandom, for tests
if (inverse && BaseSolver.asymmetricDetRandom) { // if (inverse && BaseSolver.asymmetricDetRandom) {
if (inverse && !symmetric) {
nR = max - nR nR = max - nR
} }
return nR return nR

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

@@ -210,7 +210,7 @@ sealed class BaseSolver(
} }
open fun BaseCritParams.applyRandom(p1: Pairable, p2: Pairable): Double { open fun BaseCritParams.applyRandom(p1: Pairable, p2: Pairable): Double {
val score = if (deterministic) detRandom(random, p1, p2) val score = if (deterministic) detRandom(random, p1, p2, true)
else nonDetRandom(random) else nonDetRandom(random)
return score return score
} }
@@ -404,9 +404,9 @@ sealed class BaseSolver(
val rand = val rand =
if (asymmetricDetRandom && p1.fullName() > p2.fullName()) { if (asymmetricDetRandom && p1.fullName() > p2.fullName()) {
// for old tests to pass // for old tests to pass
detRandom(randRange, p2, p1) detRandom(randRange, p2, p1, false)
} else { } else {
detRandom(randRange, p1, p2) detRandom(randRange, p1, p2, true)
} }
maxSeedingWeight - rand maxSeedingWeight - rand
} else { } else {
@@ -546,7 +546,7 @@ sealed class BaseSolver(
} else if (p1.colorBalance < p2.colorBalance) { } else if (p1.colorBalance < p2.colorBalance) {
score = 1.0 score = 1.0
} else { // choose color from a det random } else { // choose color from a det random
if (detRandom(1.0, p1, p2) === 0.0) { if (detRandom(1.0, p1, p2, false) === 0.0) {
score = 1.0 score = 1.0
} else { } else {
score = -1.0 score = -1.0