mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-16 07:10:48 +00:00
Added safety checks in case of unknown course marks
This commit is contained in:
1 parent
aeb9e33130
commit
53e5114e89
2 files changed
+13
-5
No files matched your search
+2
-1
@@ -53,7 +53,8 @@ public abstract class AbstractORCPerformanceCurveTwaLegAdapter implements ORCPer
|
||||
result = null;
|
||||
} else {
|
||||
final TimePoint referenceTimePoint = trackedLeg.getReferenceTimePoint();
|
||||
result = trackedLeg.getLegBearing(referenceTimePoint).getDifferenceTo(wind.getFrom());
|
||||
final Bearing bearing = trackedLeg.getLegBearing(referenceTimePoint);
|
||||
result = bearing != null ? bearing.getDifferenceTo(wind.getFrom()) : null;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
+11
-4
@@ -384,10 +384,17 @@ public class ORCPerformanceCurveByImpliedWindRankingMetric extends AbstractRanki
|
||||
legType = LegType.REACHING;
|
||||
}
|
||||
// use windward projection in case we deem the current leg an upwind or downwind leg
|
||||
shareOfCurrentLeg = 1.0
|
||||
- trackedLegOfCompetitor.getWindwardDistanceToGo(legType, timePoint, WindPositionMode.LEG_MIDDLE, cache).divide(
|
||||
trackedLegOfCompetitor.getTrackedLeg().getWindwardDistance(legType, timePoint, cache));
|
||||
result = totalCourse.subcourse(zeroBasedIndexOfCurrentLeg, shareOfCurrentLeg, (zeroBasedLegIndex, leg)->replaceWindwardLeewardByConstructed(zeroBasedLegIndex, leg, timePoint, cache));
|
||||
Distance windwardToGo = trackedLegOfCompetitor.getWindwardDistanceToGo(legType, timePoint,
|
||||
WindPositionMode.LEG_MIDDLE, cache);
|
||||
Distance windwardTotal = trackedLegOfCompetitor.getTrackedLeg().getWindwardDistance(legType, timePoint,
|
||||
cache);
|
||||
if (windwardToGo != null && windwardTotal != null) {
|
||||
shareOfCurrentLeg = 1.0 - windwardToGo.divide(windwardTotal);
|
||||
result = totalCourse.subcourse(zeroBasedIndexOfCurrentLeg, shareOfCurrentLeg, (zeroBasedLegIndex, leg)->replaceWindwardLeewardByConstructed(zeroBasedLegIndex, leg, timePoint, cache));
|
||||
} else {
|
||||
// Empty course
|
||||
result = cache.getTotalCourse(getTrackedRace(), ()->getTotalCourse()).subcourse(0, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
|
||||
Reference in new issue
Block a user