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

Merge remote-tracking branch 'server/master'

Browse Source
This commit is contained in:
Axel Uhl committed 2015-07-17 12:56:53 +02:00
2 parents 56fed16746 a22fffae1e
commit 97f4ac5659
1 file changed
+40 -15
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/LeaderboardData.java
+40 -15
View File
@@ -77,12 +77,16 @@ public class LeaderboardData extends ExportAction {
private static final String STRONG_WIND_DESCRIPTION = "Strong";
private static final String VERY_STRONG_WIND_DESCRIPTION = "Very Strong";
private final Map<RaceColumn, List<Competitor>> raceColumnToCompetitors;
public LeaderboardData(HttpServletRequest req, HttpServletResponse res, RacingEventService service) {
super(req, res, service);
this.raceColumnToCompetitors = new HashMap<>();
}
public LeaderboardData(Leaderboard leaderboard) {
super(leaderboard);
this.raceColumnToCompetitors = new HashMap<>();
}
/**
@@ -218,24 +222,36 @@ public class LeaderboardData extends ExportAction {
addNamedElementWithValue(raceElement, "same_day_index", sameDayGroupIndex);
addNamedElementWithValue(raceElement, "is_live", "false");
TimePoint timepointToBeUsed = MillisecondsTimePoint.now();
List<Competitor> competitorsForColumn = this.raceColumnToCompetitors.get(column);
if (competitorsForColumn == null) {
competitorsForColumn = new ArrayList<>();
}
List<Competitor> competitors = leaderboard.getCompetitorsFromBestToWorst(column, timepointToBeUsed);
for (Competitor competitorInLeaderboard : competitors) {
MaxPointsReason mpr = leaderboard.getScoreCorrection().getMaxPointsReason(competitorInLeaderboard, column, timepointToBeUsed);
if (mpr != null && !mpr.equals(MaxPointsReason.NONE)) {
// add this competitor to the list to have him evaluated
Element competitorElement = createCompetitorXML(competitorInLeaderboard, leaderboard, /*shortVersion*/ true, null);
Element competitorRaceDataElement = new Element("competitor_race_data");
MaxPointsReason maxPointsReason = leaderboard.getMaxPointsReason(competitorInLeaderboard, column, timepointToBeUsed);
addNamedElementWithValue(competitorRaceDataElement, "max_points_reason", maxPointsReason.toString());
boolean isDiscardedForCompetitor = leaderboard.isDiscarded(competitorInLeaderboard, column, timepointToBeUsed);
addNamedElementWithValue(competitorRaceDataElement, "is_discarded", isDiscardedForCompetitor == true ? "true" : "false");
Double finalRaceScore = leaderboard.getTotalPoints(competitorInLeaderboard, column, timepointToBeUsed);
addNamedElementWithValue(competitorRaceDataElement, "final_race_score", finalRaceScore);
competitorElement.addContent(competitorRaceDataElement);
raceElement.addContent(competitorElement);
raceConfidenceAndErrorMessages = updateConfidence("Competitor " + competitorInLeaderboard.getName() + " has no valid data for this race!", 0.2, raceConfidenceAndErrorMessages);
// we must keep track of competitors that we are associated to fleets
// in order to not export the score correction twice. This is needed
// because the score correction does not know about fleets and we do not
// know to which fleet the competitor belongs because no races are linked
if (!competitorsForColumn.contains(competitorInLeaderboard)) {
MaxPointsReason mpr = leaderboard.getScoreCorrection().getMaxPointsReason(competitorInLeaderboard, column, timepointToBeUsed);
if (mpr != null && !mpr.equals(MaxPointsReason.NONE)) {
// add this competitor to the list to have him evaluated
Element competitorElement = createCompetitorXML(competitorInLeaderboard, leaderboard, /*shortVersion*/ true, null);
Element competitorRaceDataElement = new Element("competitor_race_data");
MaxPointsReason maxPointsReason = leaderboard.getMaxPointsReason(competitorInLeaderboard, column, timepointToBeUsed);
addNamedElementWithValue(competitorRaceDataElement, "max_points_reason", maxPointsReason.toString());
boolean isDiscardedForCompetitor = leaderboard.isDiscarded(competitorInLeaderboard, column, timepointToBeUsed);
addNamedElementWithValue(competitorRaceDataElement, "is_discarded", isDiscardedForCompetitor == true ? "true" : "false");
Double finalRaceScore = leaderboard.getTotalPoints(competitorInLeaderboard, column, timepointToBeUsed);
addNamedElementWithValue(competitorRaceDataElement, "final_race_score", finalRaceScore);
competitorElement.addContent(competitorRaceDataElement);
raceElement.addContent(competitorElement);
raceConfidenceAndErrorMessages = updateConfidence("Competitor " + competitorInLeaderboard.getName() + " has no valid data for this race!", 0.2, raceConfidenceAndErrorMessages);
competitorsForColumn.add(competitorInLeaderboard);
}
}
}
this.raceColumnToCompetitors.put(column, competitorsForColumn);
return raceElement;
}
@@ -332,6 +348,10 @@ public class LeaderboardData extends ExportAction {
competitorToDistanceRank.put(competitorSorted, raceRankSorted);
}
List<Competitor> competitorsForColumn = this.raceColumnToCompetitors.get(column);
if (competitorsForColumn == null) {
competitorsForColumn = new ArrayList<>();
}
// it can happen that there are competitors that did not race but got points
int additionalCompetitorCount = 0;
for (Competitor competitorInLeaderboard : leaderboard.getAllCompetitors()) {
@@ -340,7 +360,7 @@ public class LeaderboardData extends ExportAction {
// check if he has an overwritten score for that race
MaxPointsReason mpr = leaderboard.getScoreCorrection().getMaxPointsReason(competitorInLeaderboard, column, race.getEndOfRace());
Fleet fleetCompetitorIsSailingIn = column.getFleetOfCompetitor(competitorInLeaderboard);
if (fleetCompetitorIsSailingIn != null && fleetCompetitorIsSailingIn.equals(fleet)) {
if (fleetCompetitorIsSailingIn != null && fleetCompetitorIsSailingIn.equals(fleet) && !competitorsForColumn.contains(competitorInLeaderboard)) {
if (mpr != null && !mpr.equals(MaxPointsReason.NONE)) {
// add this competitor to the list to have him evaluated
Element competitorElement = createCompetitorXML(competitorInLeaderboard, leaderboard, /*shortVersion*/ true, null);
@@ -355,6 +375,7 @@ public class LeaderboardData extends ExportAction {
raceElement.addContent(competitorElement);
raceConfidenceAndErrorMessages = updateConfidence("Competitor " + competitorInLeaderboard.getName() + " has no valid data for this race!", 0.2, raceConfidenceAndErrorMessages);
additionalCompetitorCount++;
competitorsForColumn.add(competitorInLeaderboard);
}
}
}
@@ -366,6 +387,9 @@ public class LeaderboardData extends ExportAction {
Element competitorElement = createCompetitorXML(competitor, leaderboard, /*shortVersion*/ true, null);
Element competitorRaceDataElement = new Element("competitor_race_data");
MaxPointsReason maxPointsReason = leaderboard.getMaxPointsReason(competitor, column, race.getEndOfRace());
if (maxPointsReason != null && !maxPointsReason.equals(MaxPointsReason.NONE)) {
competitorsForColumn.add(competitor);
}
addNamedElementWithValue(competitorRaceDataElement, "max_points_reason", maxPointsReason.toString());
boolean isDiscardedForCompetitor = leaderboard.isDiscarded(competitor, column, race.getEndOfRace());
addNamedElementWithValue(competitorRaceDataElement, "is_discarded", isDiscardedForCompetitor == true ? "true" : "false");
@@ -550,6 +574,7 @@ public class LeaderboardData extends ExportAction {
raceElement.addContent(competitorElement);
}
this.raceColumnToCompetitors.put(column, competitorsForColumn);
raceElement.addContent(createDataConfidenceXML(raceConfidenceAndErrorMessages));
raceElement.addContent(legs);
return raceElement;