Always display MMS when choosing SCOREX placement criterium
This commit is contained in:
@@ -34,6 +34,7 @@ fun Tournament<*>.getSortedPairables(round: Int, includePreliminary: Boolean = f
|
|||||||
else ceil(score - epsilon)
|
else ceil(score - epsilon)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CB TODO - factorize history helper creation between here and solver classes
|
||||||
val historyHelper = HistoryHelper(historyBefore(round + 1)) {
|
val historyHelper = HistoryHelper(historyBefore(round + 1)) {
|
||||||
if (pairing.type == PairingType.SWISS) wins.mapValues { Pair(0.0, it.value) }
|
if (pairing.type == PairingType.SWISS) wins.mapValues { Pair(0.0, it.value) }
|
||||||
else pairables.mapValues {
|
else pairables.mapValues {
|
||||||
|
@@ -92,6 +92,9 @@ object StandingsHandler: PairgothApiHandler {
|
|||||||
response.contentType = "text/plain;charset=${encoding}"
|
response.contentType = "text/plain;charset=${encoding}"
|
||||||
val neededCriteria = ArrayList(tournament.pairing.placementParams.criteria)
|
val neededCriteria = ArrayList(tournament.pairing.placementParams.criteria)
|
||||||
if (!neededCriteria.contains(NBW)) neededCriteria.add(NBW)
|
if (!neededCriteria.contains(NBW)) neededCriteria.add(NBW)
|
||||||
|
if (neededCriteria.first() == SCOREX) {
|
||||||
|
neededCriteria.add(1, MMS)
|
||||||
|
}
|
||||||
exportToEGFFormat(tournament, sortedPairables, neededCriteria, writer)
|
exportToEGFFormat(tournament, sortedPairables, neededCriteria, writer)
|
||||||
writer.flush()
|
writer.flush()
|
||||||
return null
|
return null
|
||||||
|
@@ -60,7 +60,14 @@
|
|||||||
#foreach($r in [1..$round])
|
#foreach($r in [1..$round])
|
||||||
<th>R$r</th>
|
<th>R$r</th>
|
||||||
#end
|
#end
|
||||||
|
#set($criteres = [])
|
||||||
#foreach($crit in $tour.pairing.placement)
|
#foreach($crit in $tour.pairing.placement)
|
||||||
|
#set($junk = $criteres.add($crit))
|
||||||
|
#end
|
||||||
|
#if($criteres[0] == 'SCOREX')
|
||||||
|
#set($junk = $criteres.add(1, 'MMS'))
|
||||||
|
#end
|
||||||
|
#foreach($crit in $criteres)
|
||||||
<th>$crit</th>
|
<th>$crit</th>
|
||||||
#end
|
#end
|
||||||
</thead>
|
</thead>
|
||||||
@@ -87,7 +94,7 @@
|
|||||||
#end
|
#end
|
||||||
<td class="nobreak game-result" #if($opponent)title="$esc.html($opponent.name)#if($opponent.firstname) $esc.html($opponent.firstname)#end #rank($opponent.rank)#if($opponent.country) $opponent.country#end"#end>$rst</td>
|
<td class="nobreak game-result" #if($opponent)title="$esc.html($opponent.name)#if($opponent.firstname) $esc.html($opponent.firstname)#end #rank($opponent.rank)#if($opponent.country) $opponent.country#end"#end>$rst</td>
|
||||||
#end
|
#end
|
||||||
#foreach($crit in $tour.pairing.placement)
|
#foreach($crit in $criteres)
|
||||||
<td>$number.format('0.#', $part[$crit])</td>
|
<td>$number.format('0.#', $part[$crit])</td>
|
||||||
#end
|
#end
|
||||||
</tr>
|
</tr>
|
||||||
|
Reference in New Issue
Block a user