eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-16 09:11:02 +00:00
Code Activity

Merge branch 'master' into textbox

Browse Source
This commit is contained in:
Axel Uhl committed 2013-11-13 22:24:13 +01:00
2 parents 10cad5cdcf 9720629087
commit ece5e747fa
2 files changed
+34 -24
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/tracking/impl/TrackedLegOfCompetitorImpl.java
+20 -16
View File
@@ -586,21 +586,25 @@ public class TrackedLegOfCompetitorImpl implements TrackedLegOfCompetitor {
if (speedWhenSpeedStartedToDrop != null) { if (speedWhenSpeedStartedToDrop != null) {
TimePoint timePointWhenSpeedLevelledOffAfterManeuver = fixes.get(fixes.size()-1).getTimePoint(); TimePoint timePointWhenSpeedLevelledOffAfterManeuver = fixes.get(fixes.size()-1).getTimePoint();
SpeedWithBearing speedAfterManeuver = track.getEstimatedSpeed(timePointWhenSpeedLevelledOffAfterManeuver); SpeedWithBearing speedAfterManeuver = track.getEstimatedSpeed(timePointWhenSpeedLevelledOffAfterManeuver);
// For upwind/downwind legs, find the mean course between inbound and outbound course and project actual and if (speedAfterManeuver != null) {
// extrapolated positions onto it: // For upwind/downwind legs, find the mean course between inbound and outbound course and project actual and
Bearing middleManeuverAngle = speedWhenSpeedStartedToDrop.getBearing().middle(speedAfterManeuver.getBearing()); // extrapolated positions onto it:
// extrapolate maximum speed before maneuver to time point of maximum speed after maneuver and project resulting position Bearing middleManeuverAngle = speedWhenSpeedStartedToDrop.getBearing().middle(speedAfterManeuver.getBearing());
// onto the average maneuver course; compare to the projected position actually reached at the time point of maximum speed after // extrapolate maximum speed before maneuver to time point of maximum speed after maneuver and project resulting position
// maneuver: // onto the average maneuver course; compare to the projected position actually reached at the time point of maximum speed after
Position positionWhenSpeedStartedToDrop = track.getEstimatedPosition(timePointWhenSpeedStartedToDrop, /* extrapolate */ false); // maneuver:
Position extrapolatedPositionAtTimePointOfMaxSpeedAfterManeuver = Position positionWhenSpeedStartedToDrop = track.getEstimatedPosition(timePointWhenSpeedStartedToDrop, /* extrapolate */ false);
speedWhenSpeedStartedToDrop.travelTo(positionWhenSpeedStartedToDrop, timePointWhenSpeedStartedToDrop, timePointWhenSpeedLevelledOffAfterManeuver); Position extrapolatedPositionAtTimePointOfMaxSpeedAfterManeuver =
Position actualPositionAtTimePointOfMaxSpeedAfterManeuver = track.getEstimatedPosition(timePointWhenSpeedLevelledOffAfterManeuver, /* extrapolate */ false); speedWhenSpeedStartedToDrop.travelTo(positionWhenSpeedStartedToDrop, timePointWhenSpeedStartedToDrop, timePointWhenSpeedLevelledOffAfterManeuver);
Position projectedExtrapolatedPositionAtTimePointOfMaxSpeedAfterManeuver = Position actualPositionAtTimePointOfMaxSpeedAfterManeuver = track.getEstimatedPosition(timePointWhenSpeedLevelledOffAfterManeuver, /* extrapolate */ false);
extrapolatedPositionAtTimePointOfMaxSpeedAfterManeuver.projectToLineThrough(positionWhenSpeedStartedToDrop, middleManeuverAngle); Position projectedExtrapolatedPositionAtTimePointOfMaxSpeedAfterManeuver =
Position projectedActualPositionAtTimePointOfMaxSpeedAfterManeuver = extrapolatedPositionAtTimePointOfMaxSpeedAfterManeuver.projectToLineThrough(positionWhenSpeedStartedToDrop, middleManeuverAngle);
actualPositionAtTimePointOfMaxSpeedAfterManeuver.projectToLineThrough(positionWhenSpeedStartedToDrop, middleManeuverAngle); Position projectedActualPositionAtTimePointOfMaxSpeedAfterManeuver =
result = projectedActualPositionAtTimePointOfMaxSpeedAfterManeuver.getDistance(projectedExtrapolatedPositionAtTimePointOfMaxSpeedAfterManeuver); actualPositionAtTimePointOfMaxSpeedAfterManeuver.projectToLineThrough(positionWhenSpeedStartedToDrop, middleManeuverAngle);
result = projectedActualPositionAtTimePointOfMaxSpeedAfterManeuver.getDistance(projectedExtrapolatedPositionAtTimePointOfMaxSpeedAfterManeuver);
} else {
result = null;
}
} else { } else {
result = null; result = null;
} }
@@ -641,7 +645,7 @@ public class TrackedLegOfCompetitorImpl implements TrackedLegOfCompetitor {
while (fixIter.hasNext()) { while (fixIter.hasNext()) {
fix = fixIter.next(); fix = fixIter.next();
final SpeedWithBearing estimatedSpeedAtFix = track.getEstimatedSpeed(fix.getTimePoint()); final SpeedWithBearing estimatedSpeedAtFix = track.getEstimatedSpeed(fix.getTimePoint());
if (lastFix != null) { if (lastFix != null && lastSpeed != null && lastLastSpeed != null && estimatedSpeedAtFix != null) {
if (lastSpeed.compareTo(lastLastSpeed) > 0 && lastSpeed.compareTo(estimatedSpeedAtFix) > 0) { if (lastSpeed.compareTo(lastLastSpeed) > 0 && lastSpeed.compareTo(estimatedSpeedAtFix) > 0) {
maxima.add(lastFix); maxima.add(lastFix);
} else if (lastSpeed.compareTo(lastLastSpeed) < 0 && lastSpeed.compareTo(estimatedSpeedAtFix) < 0) { } else if (lastSpeed.compareTo(lastLastSpeed) < 0 && lastSpeed.compareTo(estimatedSpeedAtFix) < 0) {
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
+14 -8
View File
@@ -2259,14 +2259,20 @@ public abstract class TrackedRaceImpl implements TrackedRace, CourseListener {
break; break;
} }
if (lastFix != null) { if (lastFix != null) {
Bearing courseAtLastFix = track.getEstimatedSpeed(lastFix.getTimePoint()).getBearing(); final SpeedWithBearing lastEstimatedSpeed = track.getEstimatedSpeed(lastFix.getTimePoint());
Bearing courseAtFix = track.getEstimatedSpeed(fix.getTimePoint()).getBearing(); if (lastEstimatedSpeed != null) {
double angleSpeedInDegreesPerSecond = Math.abs((courseAtFix.getDifferenceTo(courseAtLastFix) Bearing courseAtLastFix = lastEstimatedSpeed.getBearing();
.getDegrees()) final SpeedWithBearing estimatedSpeed = track.getEstimatedSpeed(fix.getTimePoint());
/ (double) (fix.getTimePoint().asMillis() - lastFix.getTimePoint().asMillis())); if (estimatedSpeed != null) {
if (angleSpeedInDegreesPerSecond > maxAngleSpeedInDegreesPerSecond) { Bearing courseAtFix = estimatedSpeed.getBearing();
maxAngleSpeedInDegreesPerSecond = angleSpeedInDegreesPerSecond; double angleSpeedInDegreesPerSecond = Math.abs((courseAtFix
result = lastFix.getTimePoint(); .getDifferenceTo(courseAtLastFix).getDegrees())
/ (double) (fix.getTimePoint().asMillis() - lastFix.getTimePoint().asMillis()));
if (angleSpeedInDegreesPerSecond > maxAngleSpeedInDegreesPerSecond) {
maxAngleSpeedInDegreesPerSecond = angleSpeedInDegreesPerSecond;
result = lastFix.getTimePoint();
}
}
} }
} }
lastFix = fix; lastFix = fix;