eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-22 05:35:51 +00:00
Code Activity

bug5918: add space and change comparison of bearing

Browse Source
This commit is contained in:
Lisa
2023-11-29 14:11:18 +01:00
parent 952ff6e83e
commit cbb15de7cc
2 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/WindImpl.java
+1
View File
@@ -35,6 +35,7 @@ public class WindImpl extends KnotSpeedWithBearingImpl implements Wind {
public static int hashCode(double latDeg, double lngDeg, long timePointAsMillis) {
return (31 * (int) (timePointAsMillis & Integer.MAX_VALUE)) ^ (int) (Math.round(latDeg)*Math.round(lngDeg));
}
/**
* Wind hash is determined based on time point and position only to speed this up a little.
*/
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
+26 -16
View File
@@ -1243,28 +1243,38 @@ public class TrackedLegOfCompetitorImpl implements TrackedLegOfCompetitor {
private interface BravoTrackValueExtractor<R> {
R getValue(BravoFixTrack<Competitor> track, TimePoint from, TimePoint to);
}
@Override
public TackType getTackType(TimePoint timePoint) throws NoWindException {
final TackType result;
final Position competitorPosition = getTrackedRace().getTrack(competitor).getEstimatedPosition(timePoint,
/* extrapolate */ true);
final TackType result;
MarkPassing start = getMarkPassingForLegStart();
if (start != null && start.getTimePoint().compareTo(timePoint) <= 0) {
MarkPassing end = getMarkPassingForLegEnd();
if (end != null && end.getTimePoint().compareTo(timePoint) >= 0) {
final Position waypointPosition = getTrackedRace().getApproximatePosition(getLeg().getTo(), timePoint);
final Bearing cog = getSpeedOverGround(timePoint).getBearing();
final Bearing bearingToWaypoint = competitorPosition.getBearingGreatCircle(waypointPosition);
final Bearing bearingWind = getTrackedRace().getWind(competitorPosition, timePoint).getFrom();
final Bearing diffWindtoBoat = bearingWind.getDifferenceTo(cog).abs();
final Bearing diffMarktoBoat = bearingToWaypoint.getDifferenceTo(cog).abs();
if (diffMarktoBoat.getDegrees() < diffWindtoBoat.getDegrees()) {
result = TackType.LONGTACK;
if (competitorPosition != null) {
final MarkPassing start = getMarkPassingForLegStart();
if (start != null && timePoint.after(start.getTimePoint())) {
final MarkPassing end = getMarkPassingForLegEnd();
if (end != null && timePoint.before(end.getTimePoint())) {
final Position waypointPosition = getTrackedRace().getApproximatePosition(getLeg().getTo(),
timePoint);
final Bearing cog = getSpeedOverGround(timePoint).getBearing();
final Bearing bearingToWaypoint = competitorPosition.getBearingGreatCircle(waypointPosition);
final Bearing bearingWind = getTrackedRace().getWind(competitorPosition, timePoint).getFrom();
final Bearing diffWindToBoat = bearingWind.getDifferenceTo(cog).abs();
final Bearing diffMarkToBoat = bearingToWaypoint.getDifferenceTo(cog).abs();
if (diffMarkToBoat.compareTo(diffWindToBoat) < 0) {
result = TackType.LONGTACK;
} else {
result = TackType.SHORTTACK;
}
} else {
result = TackType.SHORTTACK; }
result = null;
}
} else {
result = null; }
result = null;
}
} else {
result = null; }
result = null;
}
return result;
}
}