eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-24 14:38:45 +00:00
Code Activity

bug5292: including effective timeOnTimeFactor and

Browse Source 
timeOnDistanceAllowancePerNauticalMile in stripping / applying logic
This commit is contained in:
Dennis Aulenbacher
2020-07-01 12:53:09 +02:00
parent be7c4a8378
commit 610fbd2d0c
1 changed files with 30 additions and 10 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/dto/IncrementalLeaderboardDTO.java
+30 -10
View File
@@ -425,6 +425,15 @@ public class IncrementalLeaderboardDTO extends LeaderboardDTO implements Increme
row.competitor = expandedCompetitor;
rows.put(expandedCompetitor, row);
}
// replace null values of Regatta specific competitor handicap values with the respective competitor's default values
for(LeaderboardRowDTO row : rows.values()) {
if(row.timeOnDistanceAllowancePerNauticalMile == null) {
row.timeOnDistanceAllowancePerNauticalMile = row.competitor.getTimeOnDistanceAllowancePerNauticalMile();
}
if(row.timeOnTimeFactor == null) {
row.timeOnTimeFactor = row.competitor.getTimeOnTimeFactor();
}
}
final Set<String> rowsUnchangedForCompetitorsWithIdAsString = new HashSet<>();
if (rowsUnchanged != null) {
for (Entry<String, Set<Void>> rowUnchanged : rowsUnchanged.getAllUnchangedCompetitorIdsAsStringAndKeys(previousVersion).entrySet()) {
@@ -598,16 +607,27 @@ public class IncrementalLeaderboardDTO extends LeaderboardDTO implements Increme
// now clone the rows map to enable stripping the LeaderboardEntryDTOs inside
HashMap<CompetitorDTO, LeaderboardRowDTO> newRows = new HashMap<>();
for (Map.Entry<CompetitorDTO, LeaderboardRowDTO> competitorAndRow : rows.entrySet()) {
LeaderboardRowDTO previousRowDTO = previousVersion.rows.get(competitorAndRow.getKey());
final CompetitorDTO competitorDTO = competitorAndRow.getKey();
final LeaderboardRowDTO previousRowDTO = previousVersion.rows.get(competitorDTO);
if (Util.equalsWithNull(competitorAndRow.getValue(), previousRowDTO)
// can only compress for competitors that existed in the previous version
&& previousVersion.competitors.contains(competitorAndRow.getKey())) {
entireRowUnchanged(previousVersion, competitorAndRow.getKey());
// And don't enter into newRows. Mark all entries and all leg details in this row as unchanged for compaction of those structures:
// And don't enter into newRows. Mark all entries and all leg details in this row as unchanged for
// compaction of those structures:
} else {
LeaderboardRowDTO newRowDTO = new LeaderboardRowDTO();
cloner.clone(competitorAndRow.getValue(), newRowDTO);
CompetitorDTO compactCompetitor = compactCompetitorMap.get(competitorAndRow.getKey());
// if the Regatta specific competitor handicap values are equal to the competitor's default values they
// do not need to be transfered reduntantly
if (newRowDTO.timeOnDistanceAllowancePerNauticalMile
.equals(competitorDTO.getTimeOnDistanceAllowancePerNauticalMile())) {
newRowDTO.timeOnDistanceAllowancePerNauticalMile = null;
}
if (newRowDTO.timeOnTimeFactor.equals(competitorDTO.getTimeOnTimeFactor())) {
newRowDTO.timeOnTimeFactor = null;
}
CompetitorDTO compactCompetitor = compactCompetitorMap.get(competitorDTO);
newRowDTO.competitor = compactCompetitor;
newRows.put(compactCompetitor, newRowDTO);
HashMap<String, LeaderboardEntryDTO> newFieldsByRaceColumnName = new HashMap<String, LeaderboardEntryDTO>();
@@ -619,12 +639,12 @@ public class IncrementalLeaderboardDTO extends LeaderboardDTO implements Increme
if (previousEntryDTO != null
&& Util.equalsWithNull(raceColumnNameAndLeaderboardEntry.getValue(), previousEntryDTO)
// can only compress for competitors that existed in the previous version
&& previousVersion.competitors.contains(competitorAndRow.getKey())) {
getUnchangedLeaderboardEntries(previousVersion).unchanged(competitorAndRow.getKey(),
&& previousVersion.competitors.contains(competitorDTO)) {
getUnchangedLeaderboardEntries(previousVersion).unchanged(competitorDTO,
raceColumnNameAndLeaderboardEntry.getKey());
// also mark all leg details for the competitor for this column as unchanged; this will ensure
// that column compression can work for leg details
getLegDetailsUnchanged(previousVersion).unchanged(competitorAndRow.getKey(),
getLegDetailsUnchanged(previousVersion).unchanged(competitorDTO,
new com.sap.sse.common.Util.Pair<String, Integer>(raceColumnNameAndLeaderboardEntry.getKey(), null));
} else {
LeaderboardEntryDTO newLeaderboardEntryDTO = new LeaderboardEntryDTO();
@@ -643,9 +663,9 @@ public class IncrementalLeaderboardDTO extends LeaderboardDTO implements Increme
&& Util.equalsWithNull(legDetails,
previousEntryDTO.legDetails.get(legDetailsIndex))
// can only compress for competitors that existed in the previous version
&& previousVersion.competitors.contains(competitorAndRow.getKey())) {
&& previousVersion.competitors.contains(competitorDTO)) {
getLegDetailsUnchanged(previousVersion).unchanged(
competitorAndRow.getKey(),
competitorDTO,
new com.sap.sse.common.Util.Pair<String, Integer>(raceColumnNameAndLeaderboardEntry.getKey(),
legDetailsIndex));
newLeaderboardEntryDTO.legDetails.set(legDetailsIndex, null);
@@ -654,12 +674,12 @@ public class IncrementalLeaderboardDTO extends LeaderboardDTO implements Increme
} else {
if ((previousEntryDTO == null || previousEntryDTO.legDetails == null)
// can only compress for competitors that existed in the previous version
&& previousVersion.competitors.contains(competitorAndRow.getKey())) {
&& previousVersion.competitors.contains(competitorDTO)) {
// old and new entry are null; no need to set the legDetails in the new version to null
// as it already consumes no space;
// however, mark the legDetails as unchanged in legDetailsUnchanged so as to allow for
// all-column compression
getLegDetailsUnchanged(previousVersion).unchanged(competitorAndRow.getKey(),
getLegDetailsUnchanged(previousVersion).unchanged(competitorDTO,
new com.sap.sse.common.Util.Pair<String, Integer>(raceColumnNameAndLeaderboardEntry.getKey(), null));
}
}