eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-25 06:58:39 +00:00
Code Activity

multiple changes

Browse Source
This commit is contained in:
Finn Huelsbusch
2022-10-25 22:18:43 +02:00
parent e5c9758e26
commit f38ef2539b
15 changed files with 271 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
+15 -14
View File
@@ -48,9 +48,10 @@ import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sailing.domain.common.tracking.GPSFix;
import com.sap.sailing.domain.common.tracking.GPSFixMoving;
import com.sap.sailing.domain.common.tracking.SensorFix;
import com.sap.sailing.domain.leaderboard.RankComparable;
import com.sap.sailing.domain.leaderboard.ScoringScheme;
import com.sap.sailing.domain.leaderboard.impl.CompetitorAndRankComparable;
import com.sap.sailing.domain.leaderboard.impl.CompetitorProviderFromRaceColumnsAndRegattaLike;
import com.sap.sailing.domain.leaderboard.impl.RankAndRankComparable;
import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException;
import com.sap.sailing.domain.polars.PolarDataService;
import com.sap.sailing.domain.racelog.RaceLogAndTrackedRaceResolver;
@@ -196,17 +197,6 @@ public class MockedTrackedRace implements DynamicTrackedRace {
return 0;
}
@Override
public Pair<Integer, RankComparable> getRankAndRankComparable(Competitor competitor) throws NoWindException {
return null;
}
@Override
public Pair<Integer, RankComparable> getRankAndRankComparable(Competitor competitor, TimePoint timePoint,
WindLegTypeAndLegBearingAndORCPerformanceCurveCache cache) {
return null;
}
@Override
public Iterable<MarkPassing> getMarkPassingsInOrder(Waypoint waypoint) {
return null;
@@ -905,7 +895,12 @@ public class MockedTrackedRace implements DynamicTrackedRace {
}
@Override
public LinkedHashMap<Competitor, Pair<Integer, RankComparable>> getCompetitorsFromBestToWorstAndRankComparable(TimePoint timePoint) {
public LinkedHashMap<Competitor, RankAndRankComparable> getCompetitorsFromBestToWorstAndRankAndRankComparable(TimePoint timePoint) {
return null;
}
@Override
public List<CompetitorAndRankComparable> getCompetitorsFromBestToWorstAndRankComparable(TimePoint timePoint) {
return null;
}
@@ -1235,11 +1230,17 @@ public class MockedTrackedRace implements DynamicTrackedRace {
}
@Override
public LinkedHashMap<Competitor, Pair<Integer, RankComparable>> getCompetitorsFromBestToWorstAndRankComparable(
public LinkedHashMap<Competitor, RankAndRankComparable> getCompetitorsFromBestToWorstAndRankAndRankComparable(
TimePoint timePoint, WindLegTypeAndLegBearingAndORCPerformanceCurveCache cache) {
return null;
}
@Override
public List<CompetitorAndRankComparable> getCompetitorsFromBestToWorstAndRankComparable(TimePoint timePoint,
WindLegTypeAndLegBearingAndORCPerformanceCurveCache cache) {
return null;
}
@Override
public RankingMetric getRankingMetric() {
return null;
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithFixedRank.java
+4 -5
View File
@@ -17,10 +17,9 @@ import com.sap.sailing.domain.base.Waypoint;
import com.sap.sailing.domain.base.impl.CourseImpl;
import com.sap.sailing.domain.common.NoWindException;
import com.sap.sailing.domain.leaderboard.Leaderboard.RankComparableRank;
import com.sap.sailing.domain.leaderboard.RankComparable;
import com.sap.sailing.domain.leaderboard.impl.RankAndRankComparable;
import com.sap.sailing.domain.tracking.WindLegTypeAndLegBearingAndORCPerformanceCurveCache;
import com.sap.sse.common.TimePoint;
import com.sap.sse.common.Util.Pair;
public class MockedTrackedRaceWithFixedRank extends MockedTrackedRace {
private static final long serialVersionUID = -8587203762630194172L;
@@ -113,9 +112,9 @@ public class MockedTrackedRaceWithFixedRank extends MockedTrackedRace {
}
@Override
public LinkedHashMap<Competitor, Pair<Integer, RankComparable>> getCompetitorsFromBestToWorstAndRankComparable(TimePoint timePoint) {
LinkedHashMap<Competitor, Pair<Integer, RankComparable>> competitorsFromBestToWorst = new LinkedHashMap<Competitor, Pair<Integer, RankComparable>>();
competitorsFromBestToWorst.put(competitorsAndBoats.keySet().iterator().next(), new Pair<Integer, RankComparable>(1,new RankComparableRank(1)));
public LinkedHashMap<Competitor, RankAndRankComparable> getCompetitorsFromBestToWorstAndRankAndRankComparable(TimePoint timePoint) {
LinkedHashMap<Competitor, RankAndRankComparable> competitorsFromBestToWorst = new LinkedHashMap<Competitor, RankAndRankComparable>();
competitorsFromBestToWorst.put(competitorsAndBoats.keySet().iterator().next(),new RankAndRankComparable(1, new RankComparableRank(1)));
return competitorsFromBestToWorst;
}
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
+26 -18
View File
@@ -43,7 +43,8 @@ import com.sap.sailing.domain.common.tracking.GPSFix;
import com.sap.sailing.domain.common.tracking.GPSFixMoving;
import com.sap.sailing.domain.common.tracking.SensorFix;
import com.sap.sailing.domain.leaderboard.Leaderboard.RankComparableRank;
import com.sap.sailing.domain.leaderboard.RankComparable;
import com.sap.sailing.domain.leaderboard.impl.CompetitorAndRankComparable;
import com.sap.sailing.domain.leaderboard.impl.RankAndRankComparable;
import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException;
import com.sap.sailing.domain.polars.PolarDataService;
import com.sap.sailing.domain.ranking.RankingMetric;
@@ -233,17 +234,6 @@ public class MockedTrackedRaceWithStartTimeAndRanks implements TrackedRace {
return competitorsFromBestToWorst.indexOf(competitor) + 1;
}
@Override
public Pair<Integer, RankComparable> getRankAndRankComparable(Competitor competitor) throws NoWindException {
return new Pair<>(competitorsFromBestToWorst.indexOf(competitor) + 1, new RankComparableRank(competitorsFromBestToWorst.indexOf(competitor) + 1));
}
@Override
public Pair<Integer, RankComparable> getRankAndRankComparable(Competitor competitor, TimePoint timePoint,
WindLegTypeAndLegBearingAndORCPerformanceCurveCache cache) {
return new Pair<>(competitorsFromBestToWorst.indexOf(competitor) + 1, new RankComparableRank(competitorsFromBestToWorst.indexOf(competitor) + 1));
}
@Override
public Iterable<MarkPassing> getMarkPassingsInOrder(Waypoint waypoint) {
return null;
@@ -473,10 +463,19 @@ public class MockedTrackedRaceWithStartTimeAndRanks implements TrackedRace {
}
@Override
public LinkedHashMap<Competitor, Pair<Integer, RankComparable>> getCompetitorsFromBestToWorstAndRankComparable(TimePoint timePoint) {
LinkedHashMap<Competitor, Pair<Integer, RankComparable>> competitorsFromBestToWorstAndRankComparable = new LinkedHashMap<Competitor, Util.Pair<Integer,RankComparable>>();
public LinkedHashMap<Competitor, RankAndRankComparable> getCompetitorsFromBestToWorstAndRankAndRankComparable(TimePoint timePoint) {
LinkedHashMap<Competitor, RankAndRankComparable> competitorsFromBestToWorstAndRankComparable = new LinkedHashMap<Competitor, RankAndRankComparable>();
for(int i = 1; i <= competitorsFromBestToWorst.size(); i++) {
competitorsFromBestToWorstAndRankComparable.put(competitorsFromBestToWorst.get(i-1), new Pair<>(i, new RankComparableRank(i)));
competitorsFromBestToWorstAndRankComparable.put(competitorsFromBestToWorst.get(i-1),new RankAndRankComparable(i, new RankComparableRank(i)));
}
return competitorsFromBestToWorstAndRankComparable;
}
@Override
public List<CompetitorAndRankComparable> getCompetitorsFromBestToWorstAndRankComparable(TimePoint timePoint) {
List<CompetitorAndRankComparable> competitorsFromBestToWorstAndRankComparable = new ArrayList<CompetitorAndRankComparable>();
for(int i = 1; i <= competitorsFromBestToWorst.size(); i++) {
competitorsFromBestToWorstAndRankComparable.add(new CompetitorAndRankComparable(competitorsFromBestToWorst.get(i-1), new RankComparableRank(i)));
}
return competitorsFromBestToWorstAndRankComparable;
}
@@ -754,10 +753,19 @@ public class MockedTrackedRaceWithStartTimeAndRanks implements TrackedRace {
}
@Override
public LinkedHashMap<Competitor, Pair<Integer, RankComparable>> getCompetitorsFromBestToWorstAndRankComparable(TimePoint timePoint, WindLegTypeAndLegBearingAndORCPerformanceCurveCache cache) {
LinkedHashMap<Competitor, Pair<Integer, RankComparable>> competitorsFromBestToWorstAndRankComparable = new LinkedHashMap<Competitor, Util.Pair<Integer,RankComparable>>();
public LinkedHashMap<Competitor, RankAndRankComparable> getCompetitorsFromBestToWorstAndRankAndRankComparable(TimePoint timePoint, WindLegTypeAndLegBearingAndORCPerformanceCurveCache cache) {
LinkedHashMap<Competitor, RankAndRankComparable> competitorsFromBestToWorstAndRankComparable = new LinkedHashMap<Competitor, RankAndRankComparable>();
for(int i = 1; i <= competitorsFromBestToWorst.size(); i++) {
competitorsFromBestToWorstAndRankComparable.put(competitorsFromBestToWorst.get(i-1), new Pair<>(i, new RankComparableRank(i)));
competitorsFromBestToWorstAndRankComparable.put(competitorsFromBestToWorst.get(i-1), new RankAndRankComparable( i, new RankComparableRank(i)));
}
return competitorsFromBestToWorstAndRankComparable;
}
@Override
public List<CompetitorAndRankComparable> getCompetitorsFromBestToWorstAndRankComparable(TimePoint timePoint, WindLegTypeAndLegBearingAndORCPerformanceCurveCache cache) {
List<CompetitorAndRankComparable> competitorsFromBestToWorstAndRankComparable = new ArrayList<CompetitorAndRankComparable>();
for(int i = 1; i <= competitorsFromBestToWorst.size(); i++) {
competitorsFromBestToWorstAndRankComparable.add(new CompetitorAndRankComparable(competitorsFromBestToWorst.get(i-1), new RankComparableRank(i)));
}
return competitorsFromBestToWorstAndRankComparable;
}