eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-14 22:43:57 +00:00
Code Activity

Merge branch 'bug5890'

Browse Source
This commit is contained in:
Axel Uhl committed 2023-08-16 00:40:35 +02:00
2 parents 93ef7f1c44 8308e5a7d1
commit 9cab4a39bd
1 file changed
+5 -1
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LowPointWithEliminatingMedalSeriesWithPromotions.java
+5 -1
View File
@@ -147,9 +147,13 @@ public abstract class LowPointWithEliminatingMedalSeriesWithPromotions extends L
final int result;
final Series lastSeriesO1ScoredIn = getLastSeriesCompetitorScoredIn(o1Scores);
final Series lastSeriesO2ScoredIn = getLastSeriesCompetitorScoredIn(o2Scores);
if (lastSeriesO1ScoredIn == lastSeriesO2ScoredIn) {
// do regular score comparison if both scored only in non-medal series or up to the same medal series:
if (lastSeriesO1ScoredIn == lastSeriesO2ScoredIn ||
((lastSeriesO1ScoredIn == null || !lastSeriesO1ScoredIn.isMedal()) &&
(lastSeriesO2ScoredIn == null || !lastSeriesO2ScoredIn.isMedal()))) {
result = super.compareByScoreSum(o1, o1Scores, o1ScoreSum, o2, o2Scores, o2ScoreSum, nullScoresAreBetter, haveValidMedalRaceScores, competitorsRankedByOpeningSeries);
} else {
// at least one competitor scored in a medal series that is assumed to come after all non-medal series;
final int o1ZeroBasedLastScoredSeriesIndex = lastSeriesO1ScoredIn == null ? -1 :
Util.indexOf(lastSeriesO1ScoredIn.getRegatta().getSeries(), lastSeriesO1ScoredIn);
final int o2ZeroBasedLastScoredSeriesIndex = lastSeriesO2ScoredIn == null ? -1 :