eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-17 01:31:01 +00:00
Code Activity

Merge branch 'master' into bug4347

Browse Source
This commit is contained in:
Axel Uhl committed 2017-10-20 14:50:21 +02:00
2 parents 6ebf119dc4 f611d22d93
commit 8045f12e60
2 files changed
+10 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceResultOfCompetitorWithContext.java
+8 -1
View File
@@ -174,7 +174,14 @@ public class RaceResultOfCompetitorWithContext implements HasRaceResultOfCompeti
double competitorCount = Util.size(leaderboard.getCompetitors());
Double points = leaderboard.getTotalPoints(competitor, raceColumn, now);
if (points != null) {
double relativeLowPoints = leaderboard.getScoringScheme().isHigherBetter() ? competitorCount - points
double relativeLowPoints = leaderboard.getScoringScheme().isHigherBetter() ?
// calculate the points for first rank (doesn't necessarily need to be the number
// of competitors!) and subtract the points
leaderboard.getScoringScheme().getScoreForRank(leaderboard, raceColumn, competitor,
/* rank */ 1, // which score does the winner get in this high-point scheme?
/* numberOfCompetitorsInRaceFetcher */ ()->Util.size(raceColumn.getAllCompetitors()),
/* numberOfCompetitorsInLeaderboardFetcher */ leaderboard.getNumberOfCompetitorsInLeaderboardFetcher(),
now) - points
: points;
final double result = relativeLowPoints / competitorCount;
return result;
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/DataMiningResource.java
+2 -2
View File
@@ -31,6 +31,7 @@ import com.sap.sse.datamining.StatisticQueryDefinition;
import com.sap.sse.datamining.data.QueryResult;
import com.sap.sse.datamining.shared.DataMiningSession;
import com.sap.sse.datamining.shared.GroupKey;
import com.sap.sse.datamining.shared.data.AverageWithStats;
import com.sap.sse.datamining.shared.impl.CompoundGroupKey;
import com.sap.sse.datamining.shared.impl.GenericGroupKey;
import com.sap.sse.datamining.shared.impl.PredefinedQueryIdentifier;
@@ -174,9 +175,8 @@ public class DataMiningResource extends AbstractSailingServerResource {
race_FilterSelection.put(getRaceName, getRaceName_FilterSelection);
}
queryDefinitionDTO.setFilterSelectionFor(queryDefinitionDTO.getDataRetrieverChainDefinition().getRetrieverLevel(2), race_FilterSelection);
response = runQuery(queryDefinitionDTO, regattaName, raceName, null, "kn", 2);
response = runQuery(queryDefinitionDTO, regattaName, raceName, (AverageWithStats<Double> aws)->aws.getAverage(), "kn", 2);
}
return response;
}