527eb512716961cef8aafd3f704f03dac78b2c3b
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoringScheme.java
| ... | ... | @@ -375,7 +375,9 @@ public interface ScoringScheme extends Serializable { |
| 375 | 375 | |
| 376 | 376 | default int compareByLastMedalRacesCriteria(Competitor o1, List<Pair<RaceColumn, Double>> o1Scores, Competitor o2, |
| 377 | 377 | List<Pair<RaceColumn, Double>> o2Scores, boolean nullScoresAreBetter, Leaderboard leaderboard, |
| 378 | - Iterable<RaceColumn> raceColumnsToConsider, BiFunction<Competitor, RaceColumn, Double> totalPointsSupplier, WindLegTypeAndLegBearingAndORCPerformanceCurveCache cache, TimePoint timePoint, int zeroBasedIndexOfLastMedalSeriesInWhichBothScored, int numberOfMedalRacesWonO1, int numberOfMedalRacesWonO2) { |
|
| 378 | + Iterable<RaceColumn> raceColumnsToConsider, BiFunction<Competitor, RaceColumn, Double> totalPointsSupplier, |
|
| 379 | + WindLegTypeAndLegBearingAndORCPerformanceCurveCache cache, TimePoint timePoint, int zeroBasedIndexOfLastMedalSeriesInWhichBothScored, |
|
| 380 | + int numberOfMedalRacesWonO1, int numberOfMedalRacesWonO2) { |
|
| 379 | 381 | return 0; |
| 380 | 382 | } |
| 381 | 383 |
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LeaderboardTotalRankComparator.java
| ... | ... | @@ -316,7 +316,8 @@ public class LeaderboardTotalRankComparator implements Comparator<Competitor> { |
| 316 | 316 | if (result == 0) { |
| 317 | 317 | result = scoringScheme.compareByLastMedalRacesCriteria(o1, o1Scores, o2, o2Scores, nullScoresAreBetter, leaderboard, |
| 318 | 318 | raceColumnsToConsider, |
| 319 | - (competitor, raceColumn)->totalPointsCache.get(new Pair<>(competitor, raceColumn)), cache, timePoint, zeroBasedIndexOfLastMedalSeriesInWhichO1Scored, numberOfMedalRacesWonO1, numberOfMedalRacesWonO2); |
|
| 319 | + (competitor, raceColumn)->totalPointsCache.get(new Pair<>(competitor, raceColumn)), cache, timePoint, |
|
| 320 | + zeroBasedIndexOfLastMedalSeriesInWhichO1Scored, numberOfMedalRacesWonO1, numberOfMedalRacesWonO2); |
|
| 320 | 321 | if (result == 0) { |
| 321 | 322 | result = scoringScheme.compareByMedalRaceScore(o1MedalRaceScore, o2MedalRaceScore, nullScoresAreBetter); |
| 322 | 323 | if (result == 0) { |
| ... | ... | @@ -325,7 +326,8 @@ public class LeaderboardTotalRankComparator implements Comparator<Competitor> { |
| 325 | 326 | raceColumnsToConsider, nullScoresAreBetter, timePoint, |
| 326 | 327 | leaderboard, |
| 327 | 328 | Collections.unmodifiableMap(discardedRaceColumnsPerCompetitor), |
| 328 | - (competitor1, raceColumn1) -> totalPointsCache.get(new Pair<>(competitor1, raceColumn1)), cache); |
|
| 329 | + (competitor1, raceColumn1) -> totalPointsCache.get(new Pair<>(competitor1, raceColumn1)), |
|
| 330 | + cache); |
|
| 329 | 331 | if (result == 0) { |
| 330 | 332 | // compare by last race: |
| 331 | 333 | result = scoringScheme.compareByLastRace(o1TotalPoints, o2TotalPoints, nullScoresAreBetter, o1, o2, timePoint, cache); |