eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-31 00:07:14 +00:00
Code Activity

eliminated a few more NPEs and ranking/farthest-along inconsistencies

Browse Source
This commit is contained in:
Axel Uhl committed 2015-05-19 01:32:34 +02:00
1 parent b31fb1be1b
commit e3d3d2c906
2 files changed
+21 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/AbstractRankingMetric.java
+4 -1
View File
@@ -217,7 +217,10 @@ public abstract class AbstractRankingMetric implements RankingMetric {
for (final Competitor competitor : getTrackedRace().getRace().getCompetitors()) {
windwardDistanceTraveledPerCompetitor.put(competitor, getWindwardDistanceTraveled(competitor, timePoint, cache));
}
return (c1, c2) -> windwardDistanceTraveledPerCompetitor.get(c2).compareTo(windwardDistanceTraveledPerCompetitor.get(c1));
final Comparator<Distance> nullsLastDistanceComparator = Comparator.nullsLast(Comparator.naturalOrder());
return (c1, c2) -> nullsLastDistanceComparator.compare(
windwardDistanceTraveledPerCompetitor.get(c2),
windwardDistanceTraveledPerCompetitor.get(c1));
}
public RankingMetric.RankingInfo getRankingInfo(TimePoint timePoint, WindLegTypeAndLegBearingCache cache) {
java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/TimeOnTimeAndDistanceRankingMetric.java
+17 -10
View File
@@ -20,7 +20,6 @@ import com.sap.sailing.domain.tracking.TrackedLeg;
import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor;
import com.sap.sailing.domain.tracking.TrackedRace;
import com.sap.sailing.domain.tracking.WindLegTypeAndLegBearingCache;
import com.sap.sailing.domain.tracking.WindPositionMode;
import com.sap.sse.common.Duration;
import com.sap.sse.common.TimePoint;
import com.sap.sse.common.impl.MillisecondsDurationImpl;
@@ -106,7 +105,7 @@ public class TimeOnTimeAndDistanceRankingMetric extends AbstractRankingMetric {
public Comparator<TrackedLegOfCompetitor> getLegRankingComparator(TrackedLeg trackedLeg, TimePoint timePoint, WindLegTypeAndLegBearingCache cache) {
// competitors that have not yet started the leg will get a duration based on Long.MAX_VALUE
final Map<Competitor, Duration> correctedTimesToReachFastestBoatsPositionAtTimePointOrEndOfLegMeasuredFromStartOfRace = new HashMap<>();
final Competitor fastestCompetitorInLeg = getCompetitorFarthestAheadInLeg(trackedLeg, timePoint);
final Competitor fastestCompetitorInLeg = getCompetitorFarthestAheadInLeg(trackedLeg, timePoint, cache);
if (fastestCompetitorInLeg != null) {
final TrackedLegOfCompetitor trackedLegOfFastestCompetitorInLeg = trackedLeg.getTrackedLeg(fastestCompetitorInLeg);
final Distance totalWindwardDistanceLegLeaderTraveledUpToTimePointOrLegEnd;
@@ -161,17 +160,21 @@ public class TimeOnTimeAndDistanceRankingMetric extends AbstractRankingMetric {
}
/**
* @return <code>null</code> if no competitor has started the leg yet; the first competitor to finish the leg if any has already
* finished the leg; or the competitor with the greatest windward distance traveled in the leg at <code>timePoint</code> otherwise
* @return <code>null</code> if no competitor has started the leg yet; the first competitor to finish the leg if any
* has already finished the leg at <code>timePoint</code>; or the competitor with the greatest windward
* distance traveled in the leg at <code>timePoint</code> otherwise
*/
private Competitor getCompetitorFarthestAheadInLeg(TrackedLeg trackedLeg, TimePoint timePoint) {
private Competitor getCompetitorFarthestAheadInLeg(TrackedLeg trackedLeg, TimePoint timePoint, WindLegTypeAndLegBearingCache cache) {
Iterable<MarkPassing> markPassingsForLegEnd = getTrackedRace().getMarkPassingsInOrder(trackedLeg.getLeg().getTo());
Competitor firstAroundMark = null;
getTrackedRace().lockForRead(markPassingsForLegEnd);
try {
final Iterator<MarkPassing> i = markPassingsForLegEnd.iterator();
if (i.hasNext()) {
firstAroundMark = i.next().getCompetitor();
MarkPassing markPassing = i.next();
if (!markPassing.getTimePoint().after(timePoint)) {
firstAroundMark = markPassing.getCompetitor();
}
}
} finally {
getTrackedRace().unlockAfterRead(markPassingsForLegEnd);
@@ -181,14 +184,18 @@ public class TimeOnTimeAndDistanceRankingMetric extends AbstractRankingMetric {
result = firstAroundMark;
} else {
Iterable<MarkPassing> markPassingsForLegStart = getTrackedRace().getMarkPassingsInOrder(trackedLeg.getLeg().getFrom());
Distance minRemainingDistance = new MeterDistance(Double.MAX_VALUE);
Distance maxWindwardDistanceTraveled = new MeterDistance(Double.MIN_VALUE);
Competitor competitorFarthestAlong = null;
getTrackedRace().lockForRead(markPassingsForLegStart);
try {
for (MarkPassing mp : markPassingsForLegStart) {
final Distance remainingWindwardDistance = trackedLeg.getTrackedLeg(mp.getCompetitor()).getWindwardDistanceToGo(timePoint, WindPositionMode.LEG_MIDDLE);
if (remainingWindwardDistance.compareTo(minRemainingDistance) < 0) {
minRemainingDistance = remainingWindwardDistance;
if (mp.getTimePoint().after(timePoint)) {
break;
}
final Distance windwardDistanceTraveled = getWindwardDistanceTraveled(mp.getCompetitor(), mp.getWaypoint(),
timePoint, cache);
if (windwardDistanceTraveled.compareTo(maxWindwardDistanceTraveled) > 0) {
maxWindwardDistanceTraveled = windwardDistanceTraveled;
competitorFarthestAlong = mp.getCompetitor();
}
}