Merge remote-tracking branch 'origin/bug3716_matchracing'

2026-09-24 14:38:45 +00:00 · 2016-06-28 18:38:11 +02:00
parent 9ef59f852a
commit 80070e2dbf
12 changed files with 101 additions and 1 deletions
@@ -5,5 +5,5 @@ public enum ScoringSchemeType {
    LOW_POINT, HIGH_POINT, HIGH_POINT_ESS_OVERALL,HIGH_POINT_ESS_OVERALL_12, HIGH_POINT_LAST_BREAKS_TIE, HIGH_POINT_FIRST_GETS_TEN,
    HIGH_POINT_FIRST_GETS_ONE, LOW_POINT_WINNER_GETS_ZERO, HIGH_POINT_WINNER_GETS_SIX, HIGH_POINT_WINNER_GETS_FIVE, HIGH_POINT_WINNER_GETS_EIGHT,
    HIGH_POINT_WINNER_GETS_EIGHT_AND_INTERPOLATION, HIGH_POINT_FIRST_GETS_TEN_OR_EIGHT, HIGH_POINT_FIRST_GETS_TWELVE_OR_EIGHT, LOW_POINT_WITH_ELIMINATIONS_AND_ROUNDS_WINNER_GETS_07,
-    LOW_POINT_LEAGUE_OVERALL
+    LOW_POINT_LEAGUE_OVERALL, HIGH_POINT_MATCH_RACING
 }
@@ -510,6 +510,34 @@ public class LeaderboardScoringAndRankingTest extends AbstractLeaderboardTest {
        }
    }

+    @Test
+    public void testHighPointMatchRacingScoringScheme() throws NoWindException {
+        List<Competitor> competitors = createCompetitors(2);
+        Competitor c1 = competitors.get(0);
+        Competitor c2 = competitors.get(1);
+        Regatta regatta = createSimpleRegatta(3, "Match Racing Test",
+                DomainFactory.INSTANCE.getOrCreateBoatClass("ESS40", /* typicallyStartsUpwind */false),
+                DomainFactory.INSTANCE.createScoringScheme(ScoringSchemeType.HIGH_POINT_MATCH_RACING));
+        Leaderboard leaderboard = createLeaderboard(regatta, /* discarding thresholds */ new int[0]);
+        TimePoint now = MillisecondsTimePoint.now();
+        TimePoint later = new MillisecondsTimePoint(now.asMillis()+1000);
+        RaceColumn r1Column = series.get(0).getRaceColumnByName("R1");
+        TrackedRace r1 = new MockedTrackedRaceWithStartTimeAndRanks(now, competitors);
+        r1Column.setTrackedRace(r1Column.getFleetByName("Default"), r1);
+
+        assertEquals(1, r1Column.getTrackedRace(c1).getRank(c1, later));
+        assertEquals(1, leaderboard.getTrackedRank(c1, r1Column, later));
+        assertEquals(1, leaderboard.getTotalPoints(c1, r1Column, later), 0.00000001);
+
+        assertEquals(2, r1Column.getTrackedRace(c2).getRank(c2, later));
+        assertEquals(2, leaderboard.getTrackedRank(c2, r1Column, later));
+        assertEquals(0, leaderboard.getTotalPoints(c2, r1Column, later), 0.00000001);
+
+        List<Competitor> rankedCompetitors = leaderboard.getCompetitorsFromBestToWorst(later);
+        assertSame(c1, rankedCompetitors.get(0));
+        assertSame(c2, rankedCompetitors.get(1));
+    }
+        
    @Test
    public void testDistributionAcrossFinalFleetsWithDifferentScores() throws NoWindException {
        List<Competitor> competitors = createCompetitors(10);
@@ -1814,6 +1842,25 @@ public class LeaderboardScoringAndRankingTest extends AbstractLeaderboardTest {
        return result;
    }

+    private Regatta createSimpleRegatta(final int numberOfRaces, final String regattaName, BoatClass boatClass, ScoringScheme scoringScheme) {
+        series = new ArrayList<Series>();
+        List<Fleet> fleets = new ArrayList<Fleet>();
+        fleets.add(new FleetImpl("Default"));
+
+        List<String> raceColumnNames = new ArrayList<String>();
+        for (int i = 1; i <= numberOfRaces; i++) {
+            raceColumnNames.add("R" + i);
+        }
+        Series defaultSeries = new SeriesImpl("Default", /* isMedal */false, /* isFleetsCanRunInParallel */true,
+                fleets, raceColumnNames, /* trackedRegattaRegistry */null);
+        series.add(defaultSeries);
+
+        Regatta regatta = new RegattaImpl(RegattaImpl.getDefaultName(regattaName, boatClass.getName()), boatClass,
+        /* startDate */null, /* endDate */null, series, /* persistent */false, scoringScheme, "123", null,
+                OneDesignRankingMetric::new);
+        return regatta;
+    }
+
    private Regatta createRegatta(final int numberOfQualifyingRaces, String[] qualifyingFleetNames, final int numberOfFinalRaces,
            String[] finalFleetNames, boolean medalRaceAndSeries, final int numberOfMedalRaces, final String regattaBaseName, BoatClass boatClass, ScoringScheme scoringScheme) {
        series = new ArrayList<Series>();
@@ -48,6 +48,7 @@ import com.sap.sailing.domain.leaderboard.impl.HighPointLastBreaksTie;
 import com.sap.sailing.domain.leaderboard.impl.HighPointWinnerGetsEight;
 import com.sap.sailing.domain.leaderboard.impl.HighPointWinnerGetsEightAndInterpolation;
 import com.sap.sailing.domain.leaderboard.impl.HighPointWinnerGetsFive;
+import com.sap.sailing.domain.leaderboard.impl.HighPointMatchRacing;
 import com.sap.sailing.domain.leaderboard.impl.HighPointWinnerGetsSix;
 import com.sap.sailing.domain.leaderboard.impl.LowPoint;
 import com.sap.sailing.domain.leaderboard.impl.LowPointForLeagueOverallLeaderboard;
@@ -114,6 +115,8 @@ public class DomainFactoryImpl extends SharedDomainFactoryImpl implements Domain
            return new HighPointWinnerGetsSix();
        case HIGH_POINT_WINNER_GETS_EIGHT:
            return new HighPointWinnerGetsEight();
+        case HIGH_POINT_MATCH_RACING:
+            return new HighPointMatchRacing();
        case HIGH_POINT_WINNER_GETS_EIGHT_AND_INTERPOLATION:
            return new HighPointWinnerGetsEightAndInterpolation();
        case HIGH_POINT_FIRST_GETS_TEN_OR_EIGHT:
@@ -0,0 +1,32 @@
+package com.sap.sailing.domain.leaderboard.impl;
+
+import java.util.concurrent.Callable;
+
+import com.sap.sailing.domain.base.Competitor;
+import com.sap.sailing.domain.base.RaceColumn;
+import com.sap.sailing.domain.common.ScoringSchemeType;
+import com.sap.sailing.domain.leaderboard.Leaderboard;
+import com.sap.sailing.domain.leaderboard.NumberOfCompetitorsInLeaderboardFetcher;
+import com.sap.sse.common.TimePoint;
+
+/**
+ * Scoring system indented to by used for match racing where the winner gets 1 points and the loser gets 0 points
+ */
+public class HighPointMatchRacing extends HighPoint {
+    private static final long serialVersionUID = 9124974081268072297L;
+
+    public HighPointMatchRacing() {
+    }
+
+    @Override
+    public ScoringSchemeType getType() {
+        return ScoringSchemeType.HIGH_POINT_MATCH_RACING;
+    }
+
+    @Override
+    public Double getScoreForRank(Leaderboard leaderboard, RaceColumn raceColumn, Competitor competitor, int rank,
+            Callable<Integer> numberOfCompetitorsInRaceFetcher, NumberOfCompetitorsInLeaderboardFetcher numberOfCompetitorsInLeaderboardFetcher, TimePoint timePoint) {
+        return rank == 1 ? 1.0 : 0.0;
+    }
+
+}
@@ -419,6 +419,8 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages,
    String scoringSchemeWinnerGetsFive();
    String scoringSchemeWinnerGetsSix();
    String scoringSchemeWinnerGetsEight();
+    String scoringSchemeHighPointMatchRacing();
+    String scoringSchemeHighPointMatchRacingDescription();
    String scoringSchemeWinnerGetsEightAndInterpolation();
    String scoringSchemeLowPointWithEliminationsAndRoundsWinnerGets07();
    String scoringSchemeLowPointWithEliminationsAndRoundsWinnerGets07Description();
@@ -434,6 +434,8 @@ scoringSchemeLowPointWinnerGetsZero=Low Point System, Winner Gets Zero
 scoringSchemeWinnerGetsFive=High Point System, Winner Gets 5 Points
 scoringSchemeWinnerGetsSix=High Point System, Winner Gets 6 Points
 scoringSchemeWinnerGetsEight=High Point System, Winner Gets 8 Points
+scoringSchemeHighPointMatchRacing=High Point System, Match Racing
+scoringSchemeHighPointMatchRacingDescription=The winner of the match race gets 1 point, the loser gets 0 points
 scoringSchemeWinnerGetsEightAndInterpolation=High Point System, Winner 8 Points, Interpolated
 scoringSchemeLowPointWithEliminationsAndRoundsWinnerGets07=Low Point with Eliminations and Rounds, Winner Gets 0.7 Points
 scoringSchemeLowPointWithEliminationsAndRoundsWinnerGets07Description=A variant of the low-point scoring scheme, using eliminations consisting of rounds.\nEach round shall be modeled as a series in the regatta, and the fleet ordering counts backwards\nstarting with the highest number for the first round.\nIf a final and losers final take place, use 1 and 2 as their ordering. Start with 3 for the semi-final round.
@@ -434,6 +434,8 @@ scoringSchemeLowPointWinnerGetsZero=Low Point System, Gewinner erhält 0 Punkte
 scoringSchemeWinnerGetsFive=High Point System, Gewinner erhält 5 Punkte
 scoringSchemeWinnerGetsSix=High Point System, Gewinner erhält 6 Punkte
 scoringSchemeWinnerGetsEight=High Point System, Gewinner erhält 8 Punkte
+scoringSchemeHighPointMatchRacing=High Point System, Match Racing
+scoringSchemeHighPointMatchRacingDescription=Der Gewinner erhält 1 Punkt, der Verlierer 0 Punkte
 scoringSchemeWinnerGetsEightAndInterpolation=High Point System, Gewinner erhält 8 Punkte, interpoliert
 scoringSchemeLowPointWithEliminationsAndRoundsWinnerGets07=Low Point System mit K.O.-Runden, Gewinner erhält 0,7 Punkte
 scoringSchemeLowPointWithEliminationsAndRoundsWinnerGets07Description=Eine Variante des Low Point Systems mit mehreren K.O.-Wertungen.\nJede Runde einer Wertung wird als "Serie" in der Regatta modelliert, und die Gruppen-Ordnung wird rückwärts zählend verwendet, mit der größten Zahl für die erste Runde.\nWenn die Final-Runde in großes und kleines Finale unterteilt ist, soll das große Finale mit Ordnungszahl 1 und das kleine mit Ordnungszahl 2 modelliert werden. Das Halbfinale verwendet dann 3, usw.
@@ -432,6 +432,8 @@ scoringSchemeLowPointWinnerGetsZero=低得点方式、1 位が 0 点
 scoringSchemeWinnerGetsFive=高得点方式、1 位が 5 点
 scoringSchemeWinnerGetsSix=高得点方式、1 位が 6 点
 scoringSchemeWinnerGetsEight=高得点方式、1 位が 8 点
+scoringSchemeHighPointMatchRacing=High Point System, Match Racing
+scoringSchemeHighPointMatchRacingDescription=The winner of the match race gets 1 point, the loser gets 0 points
 scoringSchemeWinnerGetsEightAndInterpolation=高得点方式、1 位が 8 点、補間
 scoringSchemeLowPointWithEliminationsAndRoundsWinnerGets07=低得点方式、予選およびラウンドあり、1 位が 0.7 点
 scoringSchemeLowPointWithEliminationsAndRoundsWinnerGets07Description=ラウンドから構成される予選を用いた低得点方式のバリエーションです。\n各ラウンドがレガッタ内のシリーズとして形成されることになり、フリート順序は\n最初のラウンドで最も大きい数から開始してカウントダウンします。\n決勝や最下位決定戦が行われる場合は、その順序として 1 および 2 を使用します。準決勝ラウンドは 3 から始めます。
@@ -432,6 +432,8 @@ scoringSchemeLowPointWinnerGetsZero=Система низких баллов, п
 scoringSchemeWinnerGetsFive=Система высоких баллов, победитель получает 5 баллов
 scoringSchemeWinnerGetsSix=Система высоких баллов, победитель получает 6 баллов
 scoringSchemeWinnerGetsEight=Система высоких баллов, победитель получает 8 баллов
+scoringSchemeHighPointMatchRacing=High Point System, Match Racing
+scoringSchemeHighPointMatchRacingDescription=The winner of the match race gets 1 point, the loser gets 0 points
 scoringSchemeWinnerGetsEightAndInterpolation=Система высоких баллов, победитель 8 баллов, интерполяция
 scoringSchemeLowPointWithEliminationsAndRoundsWinnerGets07=Низкий балл с турами на выбывание, победитель получает 0,7 балла
 scoringSchemeLowPointWithEliminationsAndRoundsWinnerGets07Description=Вариант схемы оценки с низкими баллами, использующий туры на выбывание.\nКаждый тур моделируется как серия в регате, и суда ранжируются в обратном порядке,\nначиная с наибольшего числа за первый раунд.\nВ финале и при определении 3-го места используйте ранги 1 и 2. Для полуфинального тура начните с 3.
@@ -432,6 +432,8 @@ scoringSchemeLowPointWinnerGetsZero=低分系统，获胜者得零分
 scoringSchemeWinnerGetsFive=高分系统，获胜者得 5 分
 scoringSchemeWinnerGetsSix=高分系统，获胜者得 6 分
 scoringSchemeWinnerGetsEight=高分系统，获胜者得 8 分
+scoringSchemeHighPointMatchRacing=High Point System, Match Racing
+scoringSchemeHighPointMatchRacingDescription=The winner of the match race gets 1 point, the loser gets 0 points
 scoringSchemeWinnerGetsEightAndInterpolation=高分系统，获胜者 8 分，内插
 scoringSchemeLowPointWithEliminationsAndRoundsWinnerGets07=采用多轮淘汰制的低分系统，获胜者得 0.7 分
 scoringSchemeLowPointWithEliminationsAndRoundsWinnerGets07Description=低分记分系统的一种，采用多轮淘汰制。\n每一轮应作为比赛系列，船队顺序\n从第一轮的最高数向后计。\n如果有最终一支舰队和最终败者，则使用 1 和 2 排序。 半决赛从第 3 位开始。
@@ -432,6 +432,8 @@ scoringSchemeLowPointWinnerGetsZero=低分系统，获胜者得零分
 scoringSchemeWinnerGetsFive=高分系统，获胜者得 5 分
 scoringSchemeWinnerGetsSix=高分系统，获胜者得 6 分
 scoringSchemeWinnerGetsEight=高分系统，获胜者得 8 分
+scoringSchemeHighPointMatchRacing=High Point System, Match Racing
+scoringSchemeHighPointMatchRacingDescription=The winner of the match race gets 1 point, the loser gets 0 points
 scoringSchemeWinnerGetsEightAndInterpolation=高分系统，获胜者 8 分，内插
 scoringSchemeLowPointWithEliminationsAndRoundsWinnerGets07=采用多轮淘汰制的低分系统，获胜者得 0.7 分
 scoringSchemeLowPointWithEliminationsAndRoundsWinnerGets07Description=低分记分系统的一种，采用多轮淘汰制。\n每一轮应作为比赛系列，船队顺序\n从第一轮的最高数向后计。\n如果有最终一支舰队和最终败者，则使用 1 和 2 排序。 半决赛从第 3 位开始。
@@ -28,6 +28,8 @@ public class ScoringSchemeTypeFormatter {
            return stringMessages.scoringSchemeWinnerGetsSix();
        case HIGH_POINT_WINNER_GETS_EIGHT:
            return stringMessages.scoringSchemeWinnerGetsEight();
+        case HIGH_POINT_MATCH_RACING:
+            return stringMessages.scoringSchemeHighPointMatchRacing();
        case HIGH_POINT_WINNER_GETS_EIGHT_AND_INTERPOLATION:
            return stringMessages.scoringSchemeWinnerGetsEightAndInterpolation();
        case HIGH_POINT_FIRST_GETS_TEN_OR_EIGHT:
@@ -56,6 +58,8 @@ public class ScoringSchemeTypeFormatter {
            return stringMessages.scoringSchemeLowPointWithEliminationsAndRoundsWinnerGets07Description();
        case LOW_POINT_LEAGUE_OVERALL:
            return stringMessages.scoringSchemeLowPointForLeagueOverallLeaderboardDescription();
+        case HIGH_POINT_MATCH_RACING:
+            return stringMessages.scoringSchemeHighPointMatchRacingDescription();
        default:
            return format(scoringSchemeType, stringMessages);
        }