> getRankedCompetitorsFromBestToWorstAfterEachRaceColumn(TimePoint timePoint) throws NoWindException;
/**
- * Computes the competitor's total points sum as they were or would have been after each race column (from left to right)
+ * Computes the competitor's net points sum as they were or would have been after each race column (from left to right)
* was completed.
*
* A leaderboard fills up over time, usually "from left to right" with one race after another finishing.
@@ -173,14 +173,14 @@ public interface Leaderboard extends LeaderboardBase, HasRaceColumns {
* exactly n races. Still, this method pretends such a time point would have existed, actually ignoring
* the times at which a race took place but only looking at the resulting scores and discards.
*
- * When computing the total points sum after all columns up to and including the race column that is the key of the resulting
+ * When computing the net points sum after all columns up to and including the race column that is the key of the resulting
* map, the method applies the discarding and tie breaking rules as they would have had to be applied had the races
* in the respective column just completed.
*
* @return The resulting map is guaranteed to have the same iteration order regarding the race columns
* as {@link #getRaceColumns()}.
*/
- Map> getTotalPointsSumAfterRaceColumn(TimePoint timePoint) throws NoWindException;
+ Map> getNetPointsSumAfterRaceColumn(TimePoint timePoint) throws NoWindException;
/**
* Tells the number of points carried over from previous races not tracked by this leaderboard for
@@ -225,7 +225,7 @@ public interface Leaderboard extends LeaderboardBase, HasRaceColumns {
* @return null if the competitor didn't participate in the race or the race hasn't started yet at
* timePoint
*/
- Double getNetPoints(Competitor competitor, RaceColumn raceColumn, TimePoint timePoint);
+ Double getTotalPoints(Competitor competitor, RaceColumn raceColumn, TimePoint timePoint);
/**
* Tells if and why a competitor received "penalty" points for a race (however the scoring rules define the
@@ -235,7 +235,7 @@ public interface Leaderboard extends LeaderboardBase, HasRaceColumns {
/**
* A possibly corrected number of points for the race specified. Defaults to the result of calling
- * {@link #getNetPoints(Competitor, TrackedRace, TimePoint)} but may be corrected by the regatta rules for
+ * {@link #getTotalPoints(Competitor, TrackedRace, TimePoint)} but may be corrected by the regatta rules for
* discarding results. If {@link #isDiscarded(Competitor, RaceColumn, TimePoint) discarded}, the points returned
* will be 0.
*
@@ -249,7 +249,7 @@ public interface Leaderboard extends LeaderboardBase, HasRaceColumns {
* competitor doesn't appear in any of the race column's attached tracked races. A 0.0 score is returned
* if the competitor's result for race is discarded.
*/
- Double getTotalPoints(Competitor competitor, RaceColumn race, TimePoint timePoint) throws NoWindException;
+ Double getNetPoints(Competitor competitor, RaceColumn race, TimePoint timePoint) throws NoWindException;
/**
* Tells whether the contribution of raceColumn is discarded in the current leaderboard's standings for
@@ -260,17 +260,17 @@ public interface Leaderboard extends LeaderboardBase, HasRaceColumns {
boolean isDiscarded(Competitor competitor, RaceColumn raceColumn, TimePoint timePoint);
/**
- * Sums up the {@link #getTotalPoints(Competitor, TrackedRace, TimePoint) total points} of competitor
+ * Sums up the {@link #getNetPoints(Competitor, TrackedRace, TimePoint) net points} of competitor
* across all races tracked by this leaderboard, respecting the {@link RaceColumn#isStartsWithZeroScore()} property.
*/
- Double getTotalPoints(Competitor competitor, TimePoint timePoint);
+ Double getNetPoints(Competitor competitor, TimePoint timePoint);
/**
- * Sums up the {@link #getTotalPoints(Competitor, RaceColumn, TimePoint) total points} of competitor
+ * Sums up the {@link #getNetPoints(Competitor, RaceColumn, TimePoint) net points} of competitor
* across all race columns listed in raceColumnsToconsider, respecting the
* {@link RaceColumn#isStartsWithZeroScore()} property.
*/
- Double getTotalPoints(Competitor competitor, Iterable raceColumnsToConsider, TimePoint timePoint)
+ Double getNetPoints(Competitor competitor, Iterable raceColumnsToConsider, TimePoint timePoint)
throws NoWindException;
/**
@@ -283,8 +283,8 @@ public interface Leaderboard extends LeaderboardBase, HasRaceColumns {
* {@link Fleet#compareTo(Fleet) ordered fleets} and {@link RaceColumn#isMedalRace() medal races}. The ordering
* does not consider result discarding because when sorting for a race column it is of interest how the competitor
* performed in that race and not how the score affected the overall regatta score. Therefore, it is based on
- * {@link #getNetPoints(Competitor, RaceColumn, TimePoint)} and not on
- * {@link #getTotalPoints(Competitor, RaceColumn, TimePoint)}.
+ * {@link #getTotalPoints(Competitor, RaceColumn, TimePoint)} and not on
+ * {@link #getNetPoints(Competitor, RaceColumn, TimePoint)}.
*/
List getCompetitorsFromBestToWorst(RaceColumn raceColumn, TimePoint timePoint) throws NoWindException;
@@ -306,7 +306,7 @@ public interface Leaderboard extends LeaderboardBase, HasRaceColumns {
* computational effort compared to fetching all entries separately, particularly because all
* {@link #isDiscarded(Competitor, RaceColumn, TimePoint) discarded races} of a competitor are computed in one
* sweep using {@link ResultDiscardingRule#getDiscardedRaceColumns(Competitor, Leaderboard, Iterable, TimePoint)} only once.
- * Note that in order to get the {@link #getTotalPoints(Competitor, TimePoint) total points} for a competitor
+ * Note that in order to get the {@link #getNetPoints(Competitor, TimePoint) total points} for a competitor
* for the entire leaderboard, the {@link #getCarriedPoints(Competitor) carried-over points} need to be added.
*/
Map, Entry> getContent(TimePoint timePoint) throws NoWindException;
@@ -326,7 +326,7 @@ public interface Leaderboard extends LeaderboardBase, HasRaceColumns {
/**
* A leaderboard can carry over points from races that are not tracked by this leaderboard in detail,
* so for which no {@link RaceColumn} column is present in this leaderboard. These scores are
- * simply added to the scores tracked by this leaderboard in the {@link #getTotalPoints(Competitor, TimePoint)}
+ * simply added to the scores tracked by this leaderboard in the {@link #getNetPoints(Competitor, TimePoint)}
* method.
*/
void setCarriedPoints(Competitor competitor, double carriedPoints);
@@ -370,7 +370,7 @@ public interface Leaderboard extends LeaderboardBase, HasRaceColumns {
* that column shall be considered for discarding and counts for determining the number of races so far. Also, if a
* tracked race is connected to the column and has started already, the column is to be considered for discarding
* unless the column has several unordered fleets and not all fleets have started their race yet (see
- * {@link ScoringScheme#isValidInTotalScore(Leaderboard, RaceColumn, Competitor, TimePoint)}).
+ * {@link ScoringScheme#isValidInNetScore(Leaderboard, RaceColumn, Competitor, TimePoint)}).
*/
boolean countRaceForComparisonWithDiscardingThresholds(Competitor competitor, RaceColumn raceColumn, TimePoint timePoint);
@@ -458,14 +458,14 @@ public interface Leaderboard extends LeaderboardBase, HasRaceColumns {
Distance getTotalDistanceTraveled(Competitor competitor, TimePoint timePoint);
/**
- * Same as {@link #getTotalPoints(Competitor, RaceColumn, TimePoint)}, only that for determining the discarded
+ * Same as {@link #getNetPoints(Competitor, RaceColumn, TimePoint)}, only that for determining the discarded
* results only raceColumnsToConsider are considered.
*/
- Double getTotalPoints(Competitor competitor, RaceColumn raceColumn, Iterable raceColumnsToConsider,
+ Double getNetPoints(Competitor competitor, RaceColumn raceColumn, Iterable raceColumnsToConsider,
TimePoint timePoint) throws NoWindException;
/**
- * Same as {@link #getTotalPoints(Competitor, RaceColumn, Iterable, TimePoint)}, only that the set of discarded race columns can
+ * Same as {@link #getNetPoints(Competitor, RaceColumn, Iterable, TimePoint)}, only that the set of discarded race columns can
* be specified which is useful when total points are to be computed for more than one column for the same
* competitor because then the calculation of discards (which requires looking at all columns) only needs to be done
* once and not again for each column (which would lead to quadratic effort).
@@ -475,7 +475,7 @@ public interface Leaderboard extends LeaderboardBase, HasRaceColumns {
* {@link ResultDiscardingRule#getDiscardedRaceColumns(Competitor, Leaderboard, Iterable, TimePoint)
* getDiscardedRaceColumns(competitor, this, raceColumnsToConsider, timePoint)}.
*/
- Double getTotalPoints(Competitor competitor, RaceColumn raceColumn, TimePoint timePoint,
+ Double getNetPoints(Competitor competitor, RaceColumn raceColumn, TimePoint timePoint,
Set discardedRaceColumns);
TimePoint getNowMinusDelay();
@@ -522,7 +522,7 @@ public interface Leaderboard extends LeaderboardBase, HasRaceColumns {
*/
LeaderboardDTO getLeaderboardDTO(TimePoint timePoint,
Collection namesOfRaceColumnsForWhichToLoadLegDetails,
- boolean addOverallDetails, TrackedRegattaRegistry trackedRegattaRegistry, DomainFactory baseDomainFactory, boolean fillNetPointsUncorrected) throws NoWindException,
+ boolean addOverallDetails, TrackedRegattaRegistry trackedRegattaRegistry, DomainFactory baseDomainFactory, boolean fillTotalPointsUncorrected) throws NoWindException,
InterruptedException, ExecutionException;
NumberOfCompetitorsInLeaderboardFetcher getNumberOfCompetitorsInLeaderboardFetcher();
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoringScheme.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoringScheme.java
index a24a15b96db..1ed0b8a0c4c 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoringScheme.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoringScheme.java
@@ -96,13 +96,13 @@ public interface ScoringScheme extends Serializable {
/**
* Under certain circumstances, a scoring scheme may decide that the scores of a column are not (yet) to be used
- * for the leaderboard's total scores. This may, e.g., be the case if a column is split into more than one fleet and
+ * for the leaderboard's net scores. This may, e.g., be the case if a column is split into more than one fleet and
* those fleets are unordered. In that case, scores need to be available for all fleets before the column counts
- * for the total scores. Another example is a scoring scheme that defines elimination rounds and awards no points
+ * for the net scores. Another example is a scoring scheme that defines elimination rounds and awards no points
* to a competitor in a round from which the competitor got promoted to the next round. Such promotion columns
* then have no scores and don't count in the number of races starting from where discards are applied.
*/
- boolean isValidInTotalScore(Leaderboard leaderboard, RaceColumn raceColumn, Competitor competitor, TimePoint at);
+ boolean isValidInNetScore(Leaderboard leaderboard, RaceColumn raceColumn, Competitor competitor, TimePoint at);
/**
* Some scoring schemes are applied to {@link LeaderboardGroupMetaLeaderboard} instances. These instances of a
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/caching/LeaderboardDTOCache.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/caching/LeaderboardDTOCache.java
index b1ba96700a0..a2dbb03795c 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/caching/LeaderboardDTOCache.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/caching/LeaderboardDTOCache.java
@@ -166,7 +166,7 @@ public class LeaderboardDTOCache implements LeaderboardCache {
try {
LeaderboardDTO result = leaderboard.computeDTO(adjustedTimePoint,
namesOfRaceColumnsForWhichToLoadLegDetails, addOverallDetails,
- waitForLatestAnalyses, trackedRegattaRegistry, baseDomainFactory, /* fillNetPointsUncorrected */ false);
+ waitForLatestAnalyses, trackedRegattaRegistry, baseDomainFactory, /* fillTotalPointsUncorrected */ false);
return result;
} finally {
LockUtil.unpropagateLockSetFrom(callerThread);
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/caching/LiveLeaderboardUpdater.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/caching/LiveLeaderboardUpdater.java
index fca7707a2f4..c1b211c7d3b 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/caching/LiveLeaderboardUpdater.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/caching/LiveLeaderboardUpdater.java
@@ -297,7 +297,7 @@ public class LiveLeaderboardUpdater implements Runnable {
final boolean addOverallDetails = getOverallDetails(timePoint);
LeaderboardDTO newCacheValue = leaderboard.computeDTO(timePoint,
namesOfRaceColumnsForWhichToLoadLegDetails, addOverallDetails,
- /* waitForLatestAnalyses */false, trackedRegattaRegistry, baseDomainFactory, /* fillNetPointsUncorrected */ false);
+ /* waitForLatestAnalyses */false, trackedRegattaRegistry, baseDomainFactory, /* fillTotalPointsUncorrected */ false);
updateCacheContents(namesOfRaceColumnsForWhichToLoadLegDetails, addOverallDetails, newCacheValue);
} catch (NoWindException e) {
logger.log(Level.SEVERE, "Exception during re-calculating the live leaderboard "+leaderboard.getName(), e);
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractHighPointExtremeSailingSeriesOverall.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractHighPointExtremeSailingSeriesOverall.java
index 7505bb92988..98e4dcb9c60 100644
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractHighPointExtremeSailingSeriesOverall.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractHighPointExtremeSailingSeriesOverall.java
@@ -122,15 +122,15 @@ public abstract class AbstractHighPointExtremeSailingSeriesOverall extends HighP
List randomAccessLeaderboardList = new ArrayList(Util.size(overallLeaderboard.getLeaderboards()));
Util.addAll(overallLeaderboard.getLeaderboards(), randomAccessLeaderboardList);
for (Leaderboard leaderboardInOverall : overallLeaderboard.getLeaderboards()) {
- o1PointsInLeaderboardsOfTheGroup.add(leaderboardInOverall.getTotalPoints(o1, timePoint));
- o2PointsInLeaderboardsOfTheGroup.add(leaderboardInOverall.getTotalPoints(o2, timePoint));
+ o1PointsInLeaderboardsOfTheGroup.add(leaderboardInOverall.getNetPoints(o1, timePoint));
+ o2PointsInLeaderboardsOfTheGroup.add(leaderboardInOverall.getNetPoints(o2, timePoint));
}
int localResult = 0;
for (ListIterator reverseLeaderbaordIterator=randomAccessLeaderboardList.listIterator(randomAccessLeaderboardList.size());
reverseLeaderbaordIterator.hasPrevious(); ) {
Leaderboard leaderboardInOverall = reverseLeaderbaordIterator.previous();
- final Double o1PointsForLeaderboard = leaderboardInOverall.getTotalPoints(o1, timePoint);
- final Double o2PointsForLeaderboard = leaderboardInOverall.getTotalPoints(o2, timePoint);
+ final Double o1PointsForLeaderboard = leaderboardInOverall.getNetPoints(o1, timePoint);
+ final Double o2PointsForLeaderboard = leaderboardInOverall.getNetPoints(o2, timePoint);
if (o1PointsForLeaderboard != null && o2PointsForLeaderboard != null) {
// we're in a scheme where points never get 0 so we can safely assume
// that the last total points that are no 0 are the ones that we want to
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractScoringSchemeImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractScoringSchemeImpl.java
index 793934f0919..65fe5bcaad6 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractScoringSchemeImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractScoringSchemeImpl.java
@@ -78,7 +78,7 @@ public abstract class AbstractScoringSchemeImpl implements ScoringScheme {
* more races.
*/
@Override
- public boolean isValidInTotalScore(Leaderboard leaderboard, RaceColumn raceColumn, Competitor competitor, TimePoint at) {
+ public boolean isValidInNetScore(Leaderboard leaderboard, RaceColumn raceColumn, Competitor competitor, TimePoint at) {
boolean result;
Iterable fleets = raceColumn.getFleets();
if (Util.size(fleets) <= 1 || allFleetsOrdered(fleets)) {
@@ -101,7 +101,7 @@ public abstract class AbstractScoringSchemeImpl implements ScoringScheme {
for (Competitor competitor : leaderboard.getCompetitors()) {
Fleet fleet = raceColumn.getFleetOfCompetitor(competitor);
if (fleetsForWhichNoScoreWasFound.contains(fleet)) {
- if (leaderboard.getNetPoints(competitor, raceColumn, at) != null) {
+ if (leaderboard.getTotalPoints(competitor, raceColumn, at) != null) {
fleetsForWhichNoScoreWasFound.remove(fleet);
}
}
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
index 8c9e08365df..336895a9a6f 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
@@ -130,7 +130,7 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
/**
* Backs the {@link #getCarriedPoints(Competitor)} API with data. Can be used to prime this leaderboard
* with aggregated results of races not tracked / displayed by this leaderboard in detail. The points
- * provided by this map are considered by {@link #getTotalPoints(Competitor, TimePoint)}.
+ * provided by this map are considered by {@link #getNetPoints(Competitor, TimePoint)}.
*/
private final Map carriedPoints;
@@ -172,23 +172,23 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
*/
class EntryImpl implements Entry {
private final Callable trackedRankProvider;
+ private final Double totalPoints;
+ private final Callable totalPointsUncorrectedProvider;
+ private final boolean isTotalPointsCorrected;
private final Double netPoints;
- private final Callable netPointsUncorrectedProvider;
- private final boolean isNetPointsCorrected;
- private final Double totalPoints;
private final MaxPointsReason maxPointsReason;
private final boolean discarded;
private final Fleet fleet;
- private EntryImpl(Callable trackedRankProvider, Double netPoints,
- Callable netPointsUncorrectedProvider, boolean isNetPointsCorrected,
- Double totalPoints, MaxPointsReason maxPointsReason, boolean discarded, Fleet fleet) {
+ private EntryImpl(Callable trackedRankProvider, Double totalPoints,
+ Callable totalPointsUncorrectedProvider, boolean isTotalPointsCorrected,
+ Double netPoints, MaxPointsReason maxPointsReason, boolean discarded, Fleet fleet) {
super();
this.trackedRankProvider = trackedRankProvider;
+ this.totalPoints = totalPoints;
+ this.totalPointsUncorrectedProvider = totalPointsUncorrectedProvider;
+ this.isTotalPointsCorrected = isTotalPointsCorrected;
this.netPoints = netPoints;
- this.netPointsUncorrectedProvider = netPointsUncorrectedProvider;
- this.isNetPointsCorrected = isNetPointsCorrected;
- this.totalPoints = totalPoints;
this.maxPointsReason = maxPointsReason;
this.discarded = discarded;
this.fleet = fleet;
@@ -202,16 +202,16 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
}
}
@Override
- public Double getNetPoints() {
- return netPoints;
+ public Double getTotalPoints() {
+ return totalPoints;
}
@Override
- public boolean isNetPointsCorrected() {
- return isNetPointsCorrected;
+ public boolean isTotalPointsCorrected() {
+ return isTotalPointsCorrected;
}
@Override
- public Double getTotalPoints() {
- return totalPoints;
+ public Double getNetPoints() {
+ return netPoints;
}
@Override
public MaxPointsReason getMaxPointsReason() {
@@ -226,9 +226,9 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
return fleet;
}
@Override
- public Double getNetPointsUncorrected() {
+ public Double getTotalPointsUncorrected() {
try {
- return netPointsUncorrectedProvider.call();
+ return totalPointsUncorrectedProvider.call();
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -437,7 +437,7 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
}
@Override
- public Double getNetPoints(final Competitor competitor, final RaceColumn raceColumn, final TimePoint timePoint) {
+ public Double getTotalPoints(final Competitor competitor, final RaceColumn raceColumn, final TimePoint timePoint) {
return getScoreCorrection().getCorrectedScore(
()->getTrackedRank(competitor, raceColumn, timePoint), competitor,
raceColumn, timePoint, new NumberOfCompetitorsFetcherImpl(), getScoringScheme()).getCorrectedScore();
@@ -462,7 +462,7 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
/**
* Same as {@link #isDiscarded(Competitor, RaceColumn, TimePoint)}, only that the set of discarded race columns can
- * be specified which is useful when total points are to be computed for more than one column for the same
+ * be specified which is useful when net points are to be computed for more than one column for the same
* competitor because then the calculation of discards (which requires looking at all columns) only needs to be done
* once and not again for each column (which would lead to quadratic effort).
*
@@ -479,21 +479,21 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
}
@Override
- public Double getTotalPoints(Competitor competitor, RaceColumn raceColumn, TimePoint timePoint) throws NoWindException {
- return getTotalPoints(competitor, raceColumn, getRaceColumns(), timePoint);
+ public Double getNetPoints(Competitor competitor, RaceColumn raceColumn, TimePoint timePoint) throws NoWindException {
+ return getNetPoints(competitor, raceColumn, getRaceColumns(), timePoint);
}
@Override
- public Double getTotalPoints(Competitor competitor, RaceColumn raceColumn,
+ public Double getNetPoints(Competitor competitor, RaceColumn raceColumn,
Iterable raceColumnsToConsider, TimePoint timePoint) throws NoWindException {
final Set discardedRaceColumns = getResultDiscardingRule()
.getDiscardedRaceColumns(competitor, this, raceColumnsToConsider, timePoint);
- return getTotalPoints(competitor, raceColumn, timePoint, discardedRaceColumns);
+ return getNetPoints(competitor, raceColumn, timePoint, discardedRaceColumns);
}
/**
- * Same as {@link #getTotalPoints(Competitor, RaceColumn, Iterable, TimePoint)}, only that the set of discarded race columns can
- * be specified which is useful when total points are to be computed for more than one column for the same
+ * Same as {@link #getNetPoints(Competitor, RaceColumn, Iterable, TimePoint)}, only that the set of discarded race columns can
+ * be specified which is useful when net points are to be computed for more than one column for the same
* competitor because then the calculation of discards (which requires looking at all columns) only needs to be done
* once and not again for each column (which would lead to quadratic effort).
*
@@ -503,28 +503,28 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
* getDiscardedRaceColumns(competitor, this, raceColumnsToConsider, timePoint)}.
*/
@Override
- public Double getTotalPoints(Competitor competitor, RaceColumn raceColumn, TimePoint timePoint, Set discardedRaceColumns) {
+ public Double getNetPoints(Competitor competitor, RaceColumn raceColumn, TimePoint timePoint, Set discardedRaceColumns) {
Double result;
if (isDiscarded(competitor, raceColumn, timePoint, discardedRaceColumns)) {
result = 0.0;
} else {
- final Double netPoints = getNetPoints(competitor, raceColumn, timePoint);
- if (netPoints == null) {
+ final Double totalPoints = getTotalPoints(competitor, raceColumn, timePoint);
+ if (totalPoints == null) {
result = null;
} else {
- result = raceColumn.getFactor() * netPoints;
+ result = raceColumn.getFactor() * totalPoints;
}
}
return result;
}
@Override
- public Double getTotalPoints(Competitor competitor, TimePoint timePoint) {
- return getTotalPoints(competitor, getRaceColumns(), timePoint);
+ public Double getNetPoints(Competitor competitor, TimePoint timePoint) {
+ return getNetPoints(competitor, getRaceColumns(), timePoint);
}
@Override
- public Double getTotalPoints(Competitor competitor, final Iterable raceColumnsToConsider,
+ public Double getNetPoints(Competitor competitor, final Iterable raceColumnsToConsider,
TimePoint timePoint) {
// when a column with isStartsWithZeroScore() is found, only reset score if the competitor scored in any race from there on
boolean needToResetScoreUponNextNonEmptyEntry = false;
@@ -535,14 +535,14 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
if (raceColumn.isStartsWithZeroScore()) {
needToResetScoreUponNextNonEmptyEntry = true;
}
- if (getScoringScheme().isValidInTotalScore(this, raceColumn, competitor, timePoint)) {
- final Double totalPoints = getTotalPoints(competitor, raceColumn, timePoint, discardedRaceColumns);
- if (totalPoints != null) {
+ if (getScoringScheme().isValidInNetScore(this, raceColumn, competitor, timePoint)) {
+ final Double netPoints = getNetPoints(competitor, raceColumn, timePoint, discardedRaceColumns);
+ if (netPoints != null) {
if (needToResetScoreUponNextNonEmptyEntry) {
result = 0;
needToResetScoreUponNextNonEmptyEntry = false;
}
- result += totalPoints;
+ result += netPoints;
}
}
}
@@ -550,19 +550,19 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
}
/**
- * All competitors with non-null net points are added to the result which is then sorted by net points in ascending
- * order. The fleet, if ordered, is the primary ordering criterion, followed by the net points.
+ * All competitors with non-null total points are added to the result which is then sorted by total points in ascending
+ * order. The fleet, if ordered, is the primary ordering criterion, followed by the total points.
*/
@Override
public List getCompetitorsFromBestToWorst(final RaceColumn raceColumn, TimePoint timePoint) throws NoWindException {
- final Map> netPointsAndFleet = new HashMap>();
+ final Map> totalPointsAndFleet = new HashMap>();
for (Competitor competitor : getCompetitors()) {
- Double netPoints = getNetPoints(competitor, raceColumn, timePoint);
- if (netPoints != null) {
- netPointsAndFleet.put(competitor, new com.sap.sse.common.Util.Pair(netPoints, raceColumn.getFleetOfCompetitor(competitor)));
+ Double totalPoints = getTotalPoints(competitor, raceColumn, timePoint);
+ if (totalPoints != null) {
+ totalPointsAndFleet.put(competitor, new com.sap.sse.common.Util.Pair(totalPoints, raceColumn.getFleetOfCompetitor(competitor)));
}
}
- List result = new ArrayList(netPointsAndFleet.keySet());
+ List result = new ArrayList(totalPointsAndFleet.keySet());
Collections.sort(result, new Comparator() {
@Override
public int compare(Competitor o1, Competitor o2) {
@@ -573,8 +573,8 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
if (raceColumn.hasSplitFleets() && !raceColumn.hasSplitFleetContiguousScoring()) {
// only check fleets if there are more than one and the column is not to be contiguously scored even in case
// of split fleets
- final Fleet o1Fleet = netPointsAndFleet.get(o1).getB();
- final Fleet o2Fleet = netPointsAndFleet.get(o2).getB();
+ final Fleet o1Fleet = totalPointsAndFleet.get(o1).getB();
+ final Fleet o2Fleet = totalPointsAndFleet.get(o2).getB();
if (o1Fleet == null) {
if (o2Fleet == null) {
comparisonResult = 0;
@@ -596,7 +596,7 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
}
if (comparisonResult == 0) {
comparisonResult = getScoringScheme().getScoreComparator(/* nullScoresAreBetter */ false).compare(
- netPointsAndFleet.get(o1).getA(), netPointsAndFleet.get(o2).getA());
+ totalPointsAndFleet.get(o1).getA(), totalPointsAndFleet.get(o2).getA());
}
}
return comparisonResult;
@@ -654,7 +654,7 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
@Override
public boolean countRaceForComparisonWithDiscardingThresholds(Competitor competitor, RaceColumn raceColumn, TimePoint timePoint) {
TrackedRace trackedRaceForCompetitorInColumn;
- return getScoringScheme().isValidInTotalScore(this, raceColumn, competitor, timePoint) &&
+ return getScoringScheme().isValidInNetScore(this, raceColumn, competitor, timePoint) &&
(getScoreCorrection().isScoreCorrected(competitor, raceColumn, timePoint) ||
((trackedRaceForCompetitorInColumn=raceColumn.getTrackedRace(competitor)) != null &&
trackedRaceForCompetitorInColumn.hasStarted(timePoint) &&
@@ -703,7 +703,7 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
}
@Override
- public Map> getTotalPointsSumAfterRaceColumn(final TimePoint timePoint)
+ public Map> getNetPointsSumAfterRaceColumn(final TimePoint timePoint)
throws NoWindException {
final Map> result = new LinkedHashMap<>();
List raceColumnsToConsider = new ArrayList<>();
@@ -714,12 +714,12 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
futures.put(raceColumn, executor.submit(new Callable>() {
@Override
public Map call() {
- Map totalPointsSumPerCompetitorInColumn = new HashMap<>();
+ Map netPointsSumPerCompetitorInColumn = new HashMap<>();
for (Competitor competitor : getCompetitors()) {
- totalPointsSumPerCompetitorInColumn.put(competitor, getTotalPoints(competitor, finalRaceColumnsToConsider, timePoint));
+ netPointsSumPerCompetitorInColumn.put(competitor, getNetPoints(competitor, finalRaceColumnsToConsider, timePoint));
}
synchronized (result) {
- return totalPointsSumPerCompetitorInColumn;
+ return netPointsSumPerCompetitorInColumn;
}
}
}));
@@ -1205,7 +1205,7 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
public LeaderboardDTO computeDTO(final TimePoint timePoint,
final Collection namesOfRaceColumnsForWhichToLoadLegDetails, boolean addOverallDetails,
final boolean waitForLatestAnalyses, TrackedRegattaRegistry trackedRegattaRegistry, final DomainFactory baseDomainFactory,
- final boolean fillNetPointsUncorrected)
+ final boolean fillTotalPointsUncorrected)
throws NoWindException {
long startOfRequestHandling = System.currentTimeMillis();
final LeaderboardDTOCalculationReuseCache cache = new LeaderboardDTOCalculationReuseCache(timePoint);
@@ -1313,7 +1313,7 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
row.competitor = competitorDTO;
row.fieldsByRaceColumnName = new HashMap();
row.carriedPoints = this.hasCarriedPoints(competitor) ? this.getCarriedPoints(competitor) : null;
- row.totalPoints = this.getTotalPoints(competitor, timePoint);
+ row.netPoints = this.getNetPoints(competitor, timePoint);
if (addOverallDetails) {
addOverallDetailsToRow(timePoint, competitor, row);
}
@@ -1327,7 +1327,7 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
namesOfRaceColumnsForWhichToLoadLegDetails != null
&& namesOfRaceColumnsForWhichToLoadLegDetails.contains(raceColumn
.getName()), waitForLatestAnalyses, legRanksCache, baseDomainFactory,
- fillNetPointsUncorrected, cache);
+ fillTotalPointsUncorrected, cache);
});
executor.execute(future);
futuresForColumnName.put(raceColumn.getName(), future);
@@ -1403,8 +1403,8 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
* if false, this method is allowed to read the maneuver analysis results from a cache that
* may not reflect all data already received; otherwise, the method will always block for the latest
* cache updates to have happened before returning.
- * @param fillNetPointsUncorrected
- * tells if {@link LeaderboardEntryDTO#netPointsUncorrected} shall be filled; filling it is rather
+ * @param fillTotalPointsUncorrected
+ * tells if {@link LeaderboardEntryDTO#totalPointsUncorrected} shall be filled; filling it is rather
* expensive, especially when compared to simply retrieving a score correction, and particularly if in a
* larger fleet a number of competitors haven't properly finished the race. This should only be used for
* leaderboard editing where a user needs to see what the uncorrected score was that would be used when
@@ -1413,16 +1413,16 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
private LeaderboardEntryDTO getLeaderboardEntryDTO(Entry entry, RaceColumn raceColumn, Competitor competitor,
TimePoint timePoint, boolean addLegDetails, boolean waitForLatestAnalyses,
Map> legRanksCache, DomainFactory baseDomainFactory,
- boolean fillNetPointsUncorrected, WindLegTypeAndLegBearingCache cache) {
+ boolean fillTotalPointsUncorrected, WindLegTypeAndLegBearingCache cache) {
LeaderboardEntryDTO entryDTO = new LeaderboardEntryDTO();
TrackedRace trackedRace = raceColumn.getTrackedRace(competitor);
entryDTO.race = trackedRace == null ? null : trackedRace.getRaceIdentifier();
+ entryDTO.totalPoints = entry.getTotalPoints();
+ if (fillTotalPointsUncorrected) {
+ entryDTO.totalPointsUncorrected = entry.getTotalPointsUncorrected();
+ }
+ entryDTO.totalPointsCorrected = entry.isTotalPointsCorrected();
entryDTO.netPoints = entry.getNetPoints();
- if (fillNetPointsUncorrected) {
- entryDTO.netPointsUncorrected = entry.getNetPointsUncorrected();
- }
- entryDTO.netPointsCorrected = entry.isNetPointsCorrected();
- entryDTO.totalPoints = entry.getTotalPoints();
entryDTO.reasonForMaxPoints = entry.getMaxPointsReason();
entryDTO.discarded = entry.isDiscarded();
final GPSFixTrack track = trackedRace == null ? null : trackedRace.getTrack(competitor);
@@ -1882,7 +1882,7 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
@Override
public LeaderboardDTO getLeaderboardDTO(TimePoint timePoint,
Collection namesOfRaceColumnsForWhichToLoadLegDetails, boolean addOverallDetails,
- TrackedRegattaRegistry trackedRegattaRegistry, DomainFactory baseDomainFactory, boolean fillNetPointsUncorrected) throws NoWindException,
+ TrackedRegattaRegistry trackedRegattaRegistry, DomainFactory baseDomainFactory, boolean fillTotalPointsUncorrected) throws NoWindException,
InterruptedException, ExecutionException {
LeaderboardDTO result = null;
if (timePoint == null) {
@@ -1892,7 +1892,7 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
// when the tracked race associations or score corrections or tracked race contents changes:
final TimePoint nowMinusDelay = this.getNowMinusDelay();
final TimePoint timePointOfLatestModification = this.getTimePointOfLatestModification();
- if (fillNetPointsUncorrected || (timePointOfLatestModification != null && !nowMinusDelay.before(timePointOfLatestModification))) {
+ if (fillTotalPointsUncorrected || (timePointOfLatestModification != null && !nowMinusDelay.before(timePointOfLatestModification))) {
// if there hasn't been any modification to the leaderboard since nowMinusDelay, use non-live mode
// and pull the result from the regular leaderboard cache:
timePoint = timePointOfLatestModification;
@@ -1903,10 +1903,10 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
}
}
if (timePoint != null) {
- if (fillNetPointsUncorrected) {
- // explicitly filling the uncorrected net points requires uncached recalculation
+ if (fillTotalPointsUncorrected) {
+ // explicitly filling the uncorrected total points requires uncached recalculation
result = computeDTO(timePoint, namesOfRaceColumnsForWhichToLoadLegDetails, addOverallDetails, /* waitForLatestAnalyses */ true,
- trackedRegattaRegistry, baseDomainFactory, fillNetPointsUncorrected);
+ trackedRegattaRegistry, baseDomainFactory, fillTotalPointsUncorrected);
} else {
// in replay we'd like up-to-date results; they are still cached
// which is OK because the cache is invalidated whenever any of the tracked races attached to the
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/HighPoint.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/HighPoint.java
index 54db8e785e6..a6eb7de1f08 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/HighPoint.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/HighPoint.java
@@ -74,7 +74,7 @@ public class HighPoint extends AbstractScoringSchemeImpl {
}
@Override
- public boolean isValidInTotalScore(Leaderboard leaderboard, RaceColumn raceColumn, Competitor competitor, TimePoint at) {
+ public boolean isValidInNetScore(Leaderboard leaderboard, RaceColumn raceColumn, Competitor competitor, TimePoint at) {
return true;
}
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LeaderboardTotalRankComparator.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LeaderboardTotalRankComparator.java
index def8cd5503f..b2d40b3bb9e 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LeaderboardTotalRankComparator.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LeaderboardTotalRankComparator.java
@@ -51,8 +51,8 @@ import com.sap.sse.common.Util.Pair;
public class LeaderboardTotalRankComparator implements Comparator {
private final Leaderboard leaderboard;
private final ScoringScheme scoringScheme;
- private final Map, Double> totalPointsCache;
private final Map, Double> netPointsCache;
+ private final Map, Double> totalPointsCache;
private final boolean nullScoresAreBetter;
private final TimePoint timePoint;
@@ -82,15 +82,15 @@ public class LeaderboardTotalRankComparator implements Comparator {
this.timePoint = timePoint;
this.scoringScheme = scoringScheme;
this.nullScoresAreBetter = nullScoresAreBetter;
- totalPointsCache = new HashMap, Double>();
netPointsCache = new HashMap, Double>();
+ totalPointsCache = new HashMap, Double>();
for (Competitor competitor : leaderboard.getCompetitors()) {
Set discardedRaceColumns = leaderboard.getResultDiscardingRule().getDiscardedRaceColumns(
competitor, leaderboard, raceColumnsToConsider, timePoint);
for (RaceColumn raceColumn : raceColumnsToConsider) {
Pair key = new Util.Pair(competitor, raceColumn);
- totalPointsCache.put(key, leaderboard.getTotalPoints(competitor, raceColumn, timePoint, discardedRaceColumns));
- netPointsCache.put(key, leaderboard.getNetPoints(competitor, raceColumn, timePoint));
+ netPointsCache.put(key, leaderboard.getNetPoints(competitor, raceColumn, timePoint, discardedRaceColumns));
+ totalPointsCache.put(key, leaderboard.getTotalPoints(competitor, raceColumn, timePoint));
}
}
}
@@ -103,8 +103,8 @@ public class LeaderboardTotalRankComparator implements Comparator {
public int compare(Competitor o1, Competitor o2) {
List> o1Scores = new ArrayList<>();
List> o2Scores = new ArrayList<>();
- List> o1NetPoints = new ArrayList<>();
- List> o2NetPoints = new ArrayList<>();
+ List> o1TotalPoints = new ArrayList<>();
+ List> o2TotalPoints = new ArrayList<>();
double o1ScoreSum = getLeaderboard().getCarriedPoints(o1);
double o2ScoreSum = getLeaderboard().getCarriedPoints(o2);
Double o1MedalRaceScore = 0.0;
@@ -116,12 +116,12 @@ public class LeaderboardTotalRankComparator implements Comparator {
for (RaceColumn raceColumn : getLeaderboard().getRaceColumns()) {
needToResetO1ScoreUponNextValidResult = raceColumn.isStartsWithZeroScore();
needToResetO2ScoreUponNextValidResult = raceColumn.isStartsWithZeroScore();
- final boolean o1ValidInTotalScore = getLeaderboard().getScoringScheme().isValidInTotalScore(getLeaderboard(), raceColumn, o1, timePoint);
- final boolean o2ValidInTotalScore = getLeaderboard().getScoringScheme().isValidInTotalScore(getLeaderboard(), raceColumn, o2, timePoint);
+ final boolean o1ValidInNetScore = getLeaderboard().getScoringScheme().isValidInNetScore(getLeaderboard(), raceColumn, o1, timePoint);
+ final boolean o2ValidInNetScore = getLeaderboard().getScoringScheme().isValidInNetScore(getLeaderboard(), raceColumn, o2, timePoint);
final Double o1Score;
- if (o1ValidInTotalScore) {
+ if (o1ValidInNetScore) {
Pair key = new Util.Pair<>(o1, raceColumn);
- o1Score = totalPointsCache.get(key);
+ o1Score = netPointsCache.get(key);
if (o1Score != null) {
o1Scores.add(new Util.Pair<>(raceColumn, o1Score));
if (needToResetO1ScoreUponNextValidResult) {
@@ -130,17 +130,17 @@ public class LeaderboardTotalRankComparator implements Comparator {
}
o1ScoreSum += o1Score;
}
- final Double o1Net = netPointsCache.get(key);
- if (o1Net != null) {
- o1NetPoints.add(new Util.Pair<>(raceColumn, o1Net));
+ final Double o1Total = totalPointsCache.get(key);
+ if (o1Total != null) {
+ o1TotalPoints.add(new Util.Pair<>(raceColumn, o1Total));
}
} else {
o1Score = null;
}
final Double o2Score;
- if (o2ValidInTotalScore) {
+ if (o2ValidInNetScore) {
Pair key = new Util.Pair(o2, raceColumn);
- o2Score = totalPointsCache.get(key);
+ o2Score = netPointsCache.get(key);
if (o2Score != null) {
o2Scores.add(new Util.Pair(raceColumn, o2Score));
if (needToResetO2ScoreUponNextValidResult) {
@@ -149,14 +149,14 @@ public class LeaderboardTotalRankComparator implements Comparator {
}
o2ScoreSum += o2Score;
}
- final Double o2Net = netPointsCache.get(key);
- if (o2Net != null) {
- o2NetPoints.add(new Util.Pair<>(raceColumn, o2Net));
+ final Double o2Total = totalPointsCache.get(key);
+ if (o2Total != null) {
+ o2TotalPoints.add(new Util.Pair<>(raceColumn, o2Total));
}
} else {
o2Score = null;
}
- if (o1ValidInTotalScore && o2ValidInTotalScore) {
+ if (o1ValidInNetScore && o2ValidInNetScore) {
int preemptiveColumnResult = 0;
if (raceColumn.isMedalRace()) {
// only count the score for the medal race score if it wasn't a carry-forward column
@@ -192,7 +192,7 @@ public class LeaderboardTotalRankComparator implements Comparator {
result = compareByBetterScore(o1, Collections.unmodifiableList(o1Scores), o2, Collections.unmodifiableList(o2Scores), timePoint);
if (result == 0) {
// compare by last race:
- result = scoringScheme.compareByLastRace(o1NetPoints, o2NetPoints, nullScoresAreBetter);
+ result = scoringScheme.compareByLastRace(o1TotalPoints, o2TotalPoints, nullScoresAreBetter);
if (result == 0) {
try {
result = scoringScheme.compareByLatestRegattaInMetaLeaderboard(getLeaderboard(), o1, o2, timePoint);
@@ -209,7 +209,7 @@ public class LeaderboardTotalRankComparator implements Comparator {
/**
* Precondition: either both scored in medal race or both didn't. If both scored, the better score wins.
- * This is to be applied only if the total score of both competitors are equal to each other.
+ * This is to be applied only if the net score of both competitors are equal to each other.
*/
private int compareByMedalRaceScore(Double o1MedalRaceScore, Double o2MedalRaceScore) {
assert o1MedalRaceScore != null || o2MedalRaceScore == null;
@@ -290,7 +290,7 @@ public class LeaderboardTotalRankComparator implements Comparator {
}
/**
- * Assuming both competitors scored in the same number of races, and assuming they scored the same total score,
+ * Assuming both competitors scored in the same number of races, and assuming they scored the same net score,
* break the tie according to the {@link #scoringScheme scoring scheme} set for this comparator.
* @see ScoringScheme#compareByBetterScore(Competitor, List, Competitor, List, boolean, TimePoint)
*/
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LowPoint.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LowPoint.java
index cea11c2c6e1..3c4a9e7c02b 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LowPoint.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LowPoint.java
@@ -73,7 +73,7 @@ public class LowPoint extends AbstractScoringSchemeImpl {
}
@Override
- public boolean isValidInTotalScore(Leaderboard leaderboard, RaceColumn raceColumn, Competitor competitor, TimePoint at) {
+ public boolean isValidInNetScore(Leaderboard leaderboard, RaceColumn raceColumn, Competitor competitor, TimePoint at) {
return true;
}
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LowPointForLeagueOverallLeaderboard.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LowPointForLeagueOverallLeaderboard.java
index 282efc8d03c..d65c17f4235 100644
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LowPointForLeagueOverallLeaderboard.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LowPointForLeagueOverallLeaderboard.java
@@ -46,12 +46,12 @@ public class LowPointForLeagueOverallLeaderboard extends LowPoint {
assert Math.abs(o1ScoreSum - o2ScoreSum) < 0.00001;
assert o1Scores.stream().allMatch(rcAndScore->rcAndScore.getA() instanceof MetaLeaderboardColumn);
assert o2Scores.stream().allMatch(rcAndScore->rcAndScore.getA() instanceof MetaLeaderboardColumn);
- double totalPointsSumO1 = getTotalPoints(o1, o1Scores.stream().map(rcAndScore->rcAndScore.getA()), timePoint);
- double totalPointsSumO2 = getTotalPoints(o2, o1Scores.stream().map(rcAndScore->rcAndScore.getA()), timePoint);
- return getScoreComparator(nullScoresAreBetter).compare(totalPointsSumO1, totalPointsSumO2);
+ double netPointsSumO1 = getNetPoints(o1, o1Scores.stream().map(rcAndScore->rcAndScore.getA()), timePoint);
+ double netPointsSumO2 = getNetPoints(o2, o1Scores.stream().map(rcAndScore->rcAndScore.getA()), timePoint);
+ return getScoreComparator(nullScoresAreBetter).compare(netPointsSumO1, netPointsSumO2);
}
- private double getTotalPoints(Competitor competitor, Stream raceColumns, TimePoint timePoint) {
- return raceColumns.collect(Collectors.summingDouble(rc->((MetaLeaderboardColumn) rc).getLeaderboard().getTotalPoints(competitor, timePoint)));
+ private double getNetPoints(Competitor competitor, Stream raceColumns, TimePoint timePoint) {
+ return raceColumns.collect(Collectors.summingDouble(rc->((MetaLeaderboardColumn) rc).getLeaderboard().getNetPoints(competitor, timePoint)));
}
}
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LowPointWithEliminationsAndRoundsWinnerGets07.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LowPointWithEliminationsAndRoundsWinnerGets07.java
index 337e864477c..b9a17f1f586 100644
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LowPointWithEliminationsAndRoundsWinnerGets07.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LowPointWithEliminationsAndRoundsWinnerGets07.java
@@ -187,7 +187,7 @@ public class LowPointWithEliminationsAndRoundsWinnerGets07 extends LowPoint {
}
@Override
- public boolean isValidInTotalScore(Leaderboard leaderboard, RaceColumn raceColumn, Competitor competitor, TimePoint at) {
+ public boolean isValidInNetScore(Leaderboard leaderboard, RaceColumn raceColumn, Competitor competitor, TimePoint at) {
final RaceColumnInSeries raceColumnInSeries = (RaceColumnInSeries) raceColumn;
final Iterator seriesInRegattaIter = raceColumnInSeries.getSeries().getRegatta().getSeries().iterator();
while (seriesInRegattaIter.hasNext() && seriesInRegattaIter.next() != raceColumnInSeries.getSeries())
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ThresholdBasedResultDiscardingRuleImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ThresholdBasedResultDiscardingRuleImpl.java
index 3cd4a1da53a..122974ac73c 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ThresholdBasedResultDiscardingRuleImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ThresholdBasedResultDiscardingRuleImpl.java
@@ -79,12 +79,12 @@ public class ThresholdBasedResultDiscardingRuleImpl implements ThresholdBasedRes
int resultsToDiscard = getNumberOfResultsToDiscard(competitor, raceColumnsToConsider, leaderboard, timePoint);
Set result;
if (resultsToDiscard > 0) {
- final Map netPointsForCompetitorPerColumn = new HashMap<>();
+ final Map totalPointsForCompetitorPerColumn = new HashMap<>();
List sortedRaces = new ArrayList();
for (RaceColumn raceColumn : raceColumnsToConsider) {
if (raceColumn.isDiscardable()) {
sortedRaces.add(raceColumn);
- netPointsForCompetitorPerColumn.put(raceColumn, leaderboard.getNetPoints(competitor, raceColumn, timePoint));
+ totalPointsForCompetitorPerColumn.put(raceColumn, leaderboard.getTotalPoints(competitor, raceColumn, timePoint));
}
}
result = new HashSet();
@@ -96,8 +96,8 @@ public class ThresholdBasedResultDiscardingRuleImpl implements ThresholdBasedRes
return -leaderboard
.getScoringScheme()
.getScoreComparator(/* nullScoresAreBetter */true)
- .compare(netPointsForCompetitorPerColumn.get(raceColumn1),
- netPointsForCompetitorPerColumn.get(raceColumn2));
+ .compare(totalPointsForCompetitorPerColumn.get(raceColumn1),
+ totalPointsForCompetitorPerColumn.get(raceColumn2));
}
};
Collections.sort(sortedRaces, comparator);
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/Candidate.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/Candidate.java
index bbe1b82fbdd..0a135da9c46 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/Candidate.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/Candidate.java
@@ -5,6 +5,7 @@ import com.sap.sailing.domain.markpassingcalculation.impl.CandidateChooserImpl;
import com.sap.sailing.domain.markpassingcalculation.impl.CandidateImpl;
import com.sap.sailing.domain.tracking.MarkPassing;
import com.sap.sse.common.TimePoint;
+import com.sap.sse.common.Timed;
/**
* Represent the possible {@link MarkPassing} of a {@link Waypoint}. It contains the {@link Waypoint} it might be passing, a
@@ -16,14 +17,12 @@ import com.sap.sse.common.TimePoint;
* @author Nicolas Klose
*
*/
-public interface Candidate extends Comparable {
+public interface Candidate extends Comparable, Timed {
Waypoint getWaypoint();
int getOneBasedIndexOfWaypoint();
- TimePoint getTimePoint();
-
/**
* @return the probability that this actually is a passing.
*/
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateChooser.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateChooser.java
index 6ffbe795fb9..797237e2fd1 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateChooser.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateChooser.java
@@ -1,6 +1,7 @@
package com.sap.sailing.domain.markpassingcalculation;
import com.sap.sailing.domain.base.Competitor;
+import com.sap.sailing.domain.base.Course;
import com.sap.sailing.domain.base.Waypoint;
import com.sap.sailing.domain.markpassingcalculation.impl.CandidateImpl;
import com.sap.sailing.domain.tracking.DynamicTrackedRace;
@@ -9,18 +10,16 @@ import com.sap.sse.common.TimePoint;
public interface CandidateChooser {
/**
- * Calculates any new {@link MarkPassing}s and notifies the {@link DynamicTrackedRace}.
+ * Calculates any new {@link MarkPassing}s and notifies the {@link DynamicTrackedRace} using the
+ * {@link DynamicTrackedRace#updateMarkPassings(Competitor, Iterable)} method.
*
* @param candidateDeltas
* new {@link CandidateImpl}s and those that should be removed.
*/
-
public void calculateMarkPassDeltas(Competitor c, Iterable newCans, Iterable oldCans);
void removeWaypoints(Iterable ways);
- void addWaypoints(Iterable waypoints);
-
void setFixedPassing(Competitor c, Integer zeroBasedIndexOfWaypoint, TimePoint t);
void removeFixedPassing(Competitor c, Integer zeroBasedIndexOfWaypoint);
@@ -29,5 +28,9 @@ public interface CandidateChooser {
void stopSuppressingMarkPassings(Competitor c);
-
+ /**
+ * Updates the end proxy node's waypoint index according to the current course. Precondition:
+ * the caller holds the {@link Course}'s read lock.
+ */
+ void updateEndProxyNodeWaypointIndex();
}
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.java
index 18c46ce1ac6..85ae0e2e1f0 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.java
@@ -7,12 +7,15 @@ import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.Mark;
import com.sap.sailing.domain.base.Waypoint;
import com.sap.sailing.domain.common.tracking.GPSFix;
+import com.sap.sse.common.TimePoint;
import com.sap.sse.common.Util;
+import com.sap.sse.common.Util.Pair;
/**
* Converts the incoming GPSFixes of competitors and marks into {@link Candidate}s for each competitor.
*
* @author Nicolas Klose
+ * @author Axel Uhl (d043530)
*/
public interface CandidateFinder {
/**
@@ -26,6 +29,8 @@ public interface CandidateFinder {
/**
* When initializing or refreshing the calculator, the whole race until now is evaluated. For that purpose all of the
* {@link Candidate}s are needed instead of just the deltas.
+ *
+ * @return new {@link Candidate}s and those that should be removed
*/
Util.Pair, Iterable> getAllCandidates(Competitor c);
@@ -36,4 +41,25 @@ public interface CandidateFinder {
* mark fixes..
*/
Map> calculateFixesAffectedByNewMarkFixes(Map> newMarkFixes);
+
+ /**
+ * Notifies this finder about the race's start time having changed. The finder is only interested in the non-inferred
+ * start time and double-checks whether this non-inferred start time has changed. If so, the candidates collections
+ * are adjusted accordingly: new candidates may be added if the start time was moved towards the past and therefore
+ * extends the time range for candidates; candidates are removed if the start time was moved to a later point in time
+ * and the candidate is no longer in the time range valid for mark passings. The candidates added and removed are
+ * returned in a map keyed by the competitors. The {@link Pair#getA() first} element of the value pair has the
+ * candidates added for this competitor, the {@link Pair#getB() second} element has the candidates removed.
+ */
+ Map, Iterable>> getCandidateDeltasAfterRaceStartTimeChange();
+
+ /**
+ * Notifies this finder about the race's finished time having changed. The candidates collections are adjusted
+ * accordingly: new candidates may be added if the finished time was moved to a later point in time and therefore
+ * extends the time range for candidates; candidates are removed if the finished time was moved to an earlier point
+ * in time and the candidate is no longer in the time range valid for mark passings. The candidates added and
+ * removed are returned in a map keyed by the competitors. The {@link Pair#getA() first} element of the value pair
+ * has the candidates added for this competitor, the {@link Pair#getB() second} element has the candidates removed.
+ */
+ Map, Iterable>> getCandidateDeltasAfterRaceFinishedTimeChange(TimePoint oldFinishedTime, TimePoint newFinishedTime);
}
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingCalculator.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingCalculator.java
index 6e5837f52fc..7863238dbba 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingCalculator.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingCalculator.java
@@ -17,6 +17,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import com.sap.sailing.domain.base.Competitor;
+import com.sap.sailing.domain.base.Course;
import com.sap.sailing.domain.base.Mark;
import com.sap.sailing.domain.base.Waypoint;
import com.sap.sailing.domain.common.tracking.GPSFix;
@@ -58,6 +59,20 @@ public class MarkPassingCalculator {
/* workQueue */new LinkedBlockingQueue(), new ThreadFactoryWithPriority(Thread.NORM_PRIORITY - 1, /* daemon */ true));
private boolean suspended = false;
+
+ /**
+ * If the constructor is called with the {@code listen} parameter set to {@code true}, this field will hold a thread
+ * when the constructor has terminated normally. The thread may not yet have been started because, depending on the
+ * constructor's {@code waitForInitialMarkPassingCalculation} argument, start-up may be asynchronous, but eventually
+ * it will be started at some point. The {@link #waitUntilStopped} method can be used to wait until the thread has
+ * started and then terminated again.
+ */
+ private final Thread listenerThread;
+
+ /**
+ * Synchronized using the {@link #listenerThread} as monitor object.
+ */
+ private boolean listenerThreadStarted;
public MarkPassingCalculator(DynamicTrackedRace race, boolean listen, boolean waitForInitialMarkPassingCalculation) {
if (listen) {
@@ -66,17 +81,34 @@ public class MarkPassingCalculator {
listener = null;
}
this.race = race;
- finder = new CandidateFinderImpl(race);
+ finder = new CandidateFinderImpl(race, executor);
chooser = new CandidateChooserImpl(race);
+ if (listen) {
+ listenerThread = new Thread(new Listen(race.getRace().getName()), "MarkPassingCalculator for race " + race.getRace().getName());
+ } else {
+ listenerThread = null;
+ }
Thread t = new Thread(() -> {
+ final Set> tasks = new HashSet<>();
for (Competitor c : race.getRace().getCompetitors()) {
- Util.Pair, Iterable> allCandidates = finder.getAllCandidates(c);
- chooser.calculateMarkPassDeltas(c, allCandidates.getA(), allCandidates.getB());
+ tasks.add(()->{
+ Util.Pair, Iterable> allCandidates = finder.getAllCandidates(c);
+ chooser.calculateMarkPassDeltas(c, allCandidates.getA(), allCandidates.getB());
+ return null;
+ });
+ }
+ try {
+ executor.invokeAll(tasks);
+ } catch (Exception e) {
+ logger.log(Level.SEVERE, "Error trying to compute initial set of mark passings for race "+race.getRace().getName(), e);
}
if (listen) {
- final Thread listenerThread = new Thread(new Listen(race.getRace().getName()), "MarkPassingCalculator for race " + race.getRace().getName());
listenerThread.setDaemon(true);
listenerThread.start();
+ synchronized (listenerThread) {
+ listenerThreadStarted = true;
+ listenerThread.notifyAll();
+ }
}
}, "MarkPassingCalculator for race "+race.getRace().getName()+" initialization");
if (waitForInitialMarkPassingCalculation) {
@@ -85,6 +117,27 @@ public class MarkPassingCalculator {
t.start();
}
}
+
+ /**
+ * Waits for the listening thread to terminate. If no listening thread has been requested ({@code listen} constructor
+ * parameter {@code false}), the method returns immediately. Otherwise it waits for the listening thread to have started
+ * and then joins on the thread, using the timeout specified.
+ *
+ * This method can be useful for test cases that want to wait until all calculations have terminated for sure.
+ *
+ * @param timeoutInMillis same as for {@link Thread#join(long)}.
+ */
+ public void waitUntilStopped(final long timeoutInMillis) throws InterruptedException {
+ final long start = System.currentTimeMillis();
+ if (listenerThread != null) {
+ synchronized (listenerThread) {
+ while (!listenerThreadStarted && System.currentTimeMillis()-start < timeoutInMillis) {
+ listenerThread.wait(timeoutInMillis);
+ }
+ }
+ listenerThread.join(timeoutInMillis);
+ }
+ }
/**
* Waits until an object is in the queue, then drains it entirely. After that the information is sorted depending on
@@ -136,20 +189,35 @@ public class MarkPassingCalculator {
} else {
fixInsertion.storePositionUpdate(competitorFixes, markFixes, addedWaypoints, removedWaypoints,
smallestChangedWaypointIndex, fixedMarkPassings, removedFixedMarkPassings,
- suppressedMarkPassings, unsuppressedMarkPassings);
+ suppressedMarkPassings, unsuppressedMarkPassings, finder, chooser);
}
}
if (!finished && !suspended) {
if (smallestChangedWaypointIndex.value != -1) {
- Map, List>> candidateDeltas = finder
- .updateWaypoints(addedWaypoints, removedWaypoints, smallestChangedWaypointIndex.value);
- chooser.removeWaypoints(removedWaypoints);
- chooser.addWaypoints(addedWaypoints);
- for (Entry, List>> entry : candidateDeltas
- .entrySet()) {
- Util.Pair, List> pair = entry.getValue();
- chooser.calculateMarkPassDeltas(entry.getKey(), pair.getA(), pair.getB());
+ final Course course = race.getRace().getCourse();
+ final Map, List>> candidateDeltas;
+ // obtain the course's read lock so that the finder creates the candidate deltas under the
+ // premise of the same course as the chooser updates its end proxy node's index; they have
+ // to be consistent. See also bug 3657.
+ course.lockForRead();
+ try {
+ candidateDeltas = finder.updateWaypoints(addedWaypoints, removedWaypoints, smallestChangedWaypointIndex.value);
+ chooser.updateEndProxyNodeWaypointIndex();
+ } finally {
+ course.unlockAfterRead();
}
+ if (!removedWaypoints.isEmpty()) {
+ chooser.removeWaypoints(removedWaypoints);
+ }
+ Set> tasks = new HashSet<>();
+ for (Entry, List>> entry : candidateDeltas.entrySet()) {
+ tasks.add(()->{
+ Util.Pair, List> pair = entry.getValue();
+ chooser.calculateMarkPassDeltas(entry.getKey(), pair.getA(), pair.getB());
+ return null;
+ });
+ }
+ executor.invokeAll(tasks);
}
updateManuallySetMarkPassings(fixedMarkPassings, removedFixedMarkPassings, suppressedMarkPassings,
unsuppressedMarkPassings);
@@ -278,7 +346,7 @@ public class MarkPassingCalculator {
IntHolder smallestChangedWaypointIndex,
List> fixedMarkPassings,
List> removedMarkPassings,
- List> suppressedMarkPassings, List unSuppressedMarkPassings) {
+ List> suppressedMarkPassings, List unSuppressedMarkPassings, CandidateFinder candidateFinder, CandidateChooser candidateChooser) {
}
});
}
@@ -288,7 +356,7 @@ public class MarkPassingCalculator {
}
public void recalculateEverything() {
- finder = new CandidateFinderImpl(race);
+ finder = new CandidateFinderImpl(race, executor);
chooser = new CandidateChooserImpl(race);
for (Competitor c : race.getRace().getCompetitors()) {
Util.Pair, Iterable> allCandidates = finder.getAllCandidates(c);
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingUpdateListener.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingUpdateListener.java
index fd08651b813..4c0ccc67f2f 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingUpdateListener.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingUpdateListener.java
@@ -3,6 +3,7 @@ package com.sap.sailing.domain.markpassingcalculation;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.logging.Logger;
@@ -39,7 +40,7 @@ public class MarkPassingUpdateListener extends AbstractRaceChangeListener {
Map> markFixes, List addedWaypoints, List removedWaypoints,
IntHolder smallestChangedWaypointIndex, List> fixedMarkPassings,
List> removedMarkPassings,
- List> suppressedMarkPassings, List unSuppressedMarkPassings) {
+ List> suppressedMarkPassings, List unSuppressedMarkPassings, CandidateFinder candidateFinder, CandidateChooser candidateChooser) {
}
};
@@ -50,7 +51,6 @@ public class MarkPassingUpdateListener extends AbstractRaceChangeListener {
raceName = race.getRace().getName();
queue = new LinkedBlockingQueue<>();
race.addListener(this);
- race.getRace().getCourse().addCourseListener(this);
}
public BlockingQueue getQueue() {
@@ -66,7 +66,7 @@ public class MarkPassingUpdateListener extends AbstractRaceChangeListener {
IntHolder smallestChangedWaypointIndex,
List> fixedMarkPassings,
List> removedMarkPassings,
- List> suppressedMarkPassings, List unSuppressedMarkPassings) {
+ List> suppressedMarkPassings, List unSuppressedMarkPassings, CandidateFinder candidateFinder, CandidateChooser candidateChooser) {
List list = competitorFixes.get(competitor);
if (list == null) {
list = new ArrayList<>();
@@ -86,7 +86,7 @@ public class MarkPassingUpdateListener extends AbstractRaceChangeListener {
IntHolder smallestChangedWaypointIndex,
List> fixedMarkPassings,
List> removedMarkPassings,
- List> suppressedMarkPassings, List unSuppressedMarkPassings) {
+ List> suppressedMarkPassings, List unSuppressedMarkPassings, CandidateFinder candidateFinder, CandidateChooser candidateChooser) {
List list = markFixes.get(mark);
if (list == null) {
list = new ArrayList<>();
@@ -115,9 +115,9 @@ public class MarkPassingUpdateListener extends AbstractRaceChangeListener {
IntHolder smallestChangedWaypointIndex,
List> fixedMarkPassings,
List> removedMarkPassings,
- List> suppressedMarkPassings, List unSuppressedMarkPassings) {
+ List> suppressedMarkPassings, List unSuppressedMarkPassings, CandidateFinder candidateFinder, CandidateChooser candidateChooser) {
addedWaypoints.add(waypointThatGotAdded);
- if (smallestChangedWaypointIndex.value == -1|| smallestChangedWaypointIndex.value > zeroBasedIndex) {
+ if (smallestChangedWaypointIndex.value == -1 || smallestChangedWaypointIndex.value > zeroBasedIndex) {
smallestChangedWaypointIndex.value = zeroBasedIndex;
}
}
@@ -133,7 +133,7 @@ public class MarkPassingUpdateListener extends AbstractRaceChangeListener {
IntHolder smallestChangedWaypointIndex,
List> fixedMarkPassings,
List> removedMarkPassings,
- List> suppressedMarkPassings, List unSuppressedMarkPassings) {
+ List