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

fixed leg time issue in Xcelsius / BOBJ adapter

Browse Source
This commit is contained in:
Axel Uhl committed 2013-01-23 15:25:56 +01:00
1 parent ff4425e9d9
commit 8d2fc6803b
1 file changed
+6 -35
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RegattaDataPerLeg.java
+6 -35
View File
@@ -5,7 +5,6 @@ import java.util.Calendar;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.NavigableSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -144,10 +143,6 @@ public class RegattaDataPerLeg extends Action {
int i = 0; // initialize leg index
TrackedLeg previousLeg = null;
LinkedHashMap<String, Long> legTimesAlternate = new LinkedHashMap<String, Long>(); // Map for leg times
// calculated by mark
// passings
final Element legs_node = addNamedElement(race_node, "legs"); // add element that holds all legs for the
// race
@@ -172,39 +167,15 @@ public class RegattaDataPerLeg extends Action {
// each competitor
for (final Competitor competitor : ranks.keySet()) { // Get competitor data
TrackedLegOfCompetitor trackedLegOfCompetitor = trackedLeg.getTrackedLeg(competitor); // Get data
TimePoint compareLegEnd = new MillisecondsTimePoint(0);
// time elapsed / when did the competitor pass the end mark of the leg
final NavigableSet<MarkPassing> markPassings = trackedRace.getMarkPassings(competitor);
trackedRace.lockForRead(markPassings);
try {
for (MarkPassing mp : markPassings) {
if (mp.getWaypoint() == leg.getTo()) {
compareLegEnd = mp.getTimePoint();
break;
}
}
} finally {
trackedRace.unlockAfterRead(markPassings);
MarkPassing mp = trackedRace.getMarkPassing(competitor, leg.getTo());
if (mp != null) {
compareLegEnd = mp.getTimePoint();
}
// leg time / based on elapsed time
if (legTimesAlternate.containsKey(competitor.getName())) {
legTimesAlternate.put(
competitor.getName(),
compareLegEnd.asMillis() - legTimesAlternate.get(competitor.getName())
- raceStarted.asMillis());
} else {
legTimesAlternate.put(competitor.getName(), compareLegEnd.asMillis() - raceStarted.asMillis());
}
final TimePoint compLegTimeAlt = new MillisecondsTimePoint(legTimesAlternate.get(competitor
.getName()));
final TimePoint compFinishedLeg = new MillisecondsTimePoint(compareLegEnd.asMillis());
final long compLegTimeAlt = trackedLegOfCompetitor.getTimeInMilliSeconds(compareLegEnd);
final TimePoint compFinishedLeg = compareLegEnd;
// plausibility check
// competitor has finished the leg and the leg end time is not the race start time
@@ -244,7 +215,7 @@ public class RegattaDataPerLeg extends Action {
}
addNamedElementWithValue(competitor_node, "leg_finished_time_ms", compFinishedLeg.asMillis());
addNamedElementWithValue(competitor_node, "time_elapsed_ms", compFinishedLeg.asMillis() - raceStarted.asMillis());
addNamedElementWithValue(competitor_node, "leg_time_ms", compLegTimeAlt.asMillis());
addNamedElementWithValue(competitor_node, "leg_time_ms", compLegTimeAlt);
addNamedElementWithValue(competitor_node, "leg_rank", trackedLegOfCompetitor.getRank(compFinishedLeg));
addNamedElementWithValue(competitor_node, "race_final_rank", trackedRace.getRank(competitor));
addNamedElementWithValue(competitor_node, "rank_gain", posGL * -1); // Ranks Gained/Lost