bug5752: fixed discarding and display of discarded results in columns with factors != 1

This commit is contained in:
Axel Uhl
2022-06-23 17:39:31 +02:00
parent 17dcd59be0
commit 38f5a6caf6
12 changed files with 84 additions and 34 deletions
@@ -141,7 +141,7 @@ public class MarkPassingsJsonSerializer extends AbstractTrackedRaceDataJsonSeria
return totalPointsForRaceColumn;
};
final Set<RaceColumn> discardedRaceColumns = leaderboard.getResultDiscardingRule().getDiscardedRaceColumns(competitor, leaderboard,
leaderboard.getRaceColumns(), markPassing.getTimePoint(), totalPointsSupplier, cache);
leaderboard.getRaceColumns(), markPassing.getTimePoint(), leaderboard.getScoringScheme(), totalPointsSupplier, cache);
final Double netPoints = leaderboard.getNetPoints(competitor, raceColumnAndFleet.getA(),
markPassing.getTimePoint(), discardedRaceColumns, ()->totalPoints);
markPassingJson.put(POINTS_BASED_ON_PASSING_ORDER, totalPoints);