eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-08 20:12:23 +00:00
Code Activity

offer implied wind also in charts and LeaderboardsResourceV2

Browse Source
This commit is contained in:
Axel Uhl committed 2020-03-01 12:19:36 +01:00
1 parent cae03140ae
commit 6cff2f2aa3
6 files changed
+67 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java
+1
View File
@@ -263,6 +263,7 @@ public enum DetailType implements Serializable {
availableDetailsTypes.add(DetailType.LEG_GAP_TO_LEADER_IN_SECONDS);
availableDetailsTypes.add(DetailType.RACE_CURRENT_SPEED_OVER_GROUND_IN_KNOTS);
availableDetailsTypes.add(DetailType.RACE_RANK);
availableDetailsTypes.add(DetailType.RACE_IMPLIED_WIND);
availableDetailsTypes.add(DetailType.REGATTA_RANK);
availableDetailsTypes.add(DetailType.CHART_DISTANCE_TO_START_LINE);
availableDetailsTypes.add(DetailType.CHART_BEAT_ANGLE);
java/com.sap.sailing.domain/src/com/sap/sailing/domain/orc/ORCPerformanceCurveRankingMetric.java
+23
View File
@@ -0,0 +1,23 @@
package com.sap.sailing.domain.orc;
import org.apache.commons.math.FunctionEvaluationException;
import org.apache.commons.math.MaxIterationsExceededException;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.ranking.RankingMetric;
import com.sap.sailing.domain.tracking.WindLegTypeAndLegBearingAndORCPerformanceCurveCache;
import com.sap.sse.common.Speed;
import com.sap.sse.common.TimePoint;
/**
* Marker interface for all ORC Performance Curve Scoring (PCS) ranking
* metrics ({@link RankingMetric}).
*
* @author Axel Uhl (D043530)
*
*/
public interface ORCPerformanceCurveRankingMetric {
Speed getImpliedWind(Competitor competitor, TimePoint timePoint,
WindLegTypeAndLegBearingAndORCPerformanceCurveCache cache)
throws FunctionEvaluationException, MaxIterationsExceededException;
}
java/com.sap.sailing.domain/src/com/sap/sailing/domain/orc/impl/ORCPerformanceCurveByImpliedWindRankingMetric.java
+3 -1
View File
@@ -76,7 +76,8 @@ import com.sap.sse.common.Util;
import com.sap.sse.common.Util.Pair;
import com.sap.sse.common.impl.MillisecondsDurationImpl;
public class ORCPerformanceCurveByImpliedWindRankingMetric extends AbstractRankingMetric {
public class ORCPerformanceCurveByImpliedWindRankingMetric extends AbstractRankingMetric
implements com.sap.sailing.domain.orc.ORCPerformanceCurveRankingMetric {
private static final long serialVersionUID = -7814822523533929816L;
private static final Logger logger = Logger.getLogger(ORCPerformanceCurveByImpliedWindRankingMetric.class.getName());
@@ -492,6 +493,7 @@ public class ORCPerformanceCurveByImpliedWindRankingMetric extends AbstractRanki
return performanceCurveForPartialCourse;
}
@Override
public Speed getImpliedWind(Competitor competitor, TimePoint timePoint, WindLegTypeAndLegBearingAndORCPerformanceCurveCache cache) throws FunctionEvaluationException, MaxIterationsExceededException {
final Speed result;
final ORCPerformanceCurve performanceCurveForPartialCourse = cache.getPerformanceCurveForPartialCourse(timePoint, getTrackedRace(), competitor, getPerformanceCurveSupplier(cache));
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
+2 -1
View File
@@ -61,7 +61,8 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sse.datamining.ui,
org.mongodb.mongo-java-driver;bundle-version="3.6.4",
com.sap.sailing.server.gateway.serialization.shared.android,
com.sap.sailing.shared.server
com.sap.sailing.shared.server,
org.apache.commons.math;bundle-version="2.1.0"
Bundle-Activator: com.sap.sailing.gwt.ui.server.Activator
Bundle-ActivationPolicy: lazy
Import-Package: javax.servlet;version="3.1.0",
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+31 -1
View File
@@ -65,6 +65,8 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.math.FunctionEvaluationException;
import org.apache.commons.math.MaxIterationsExceededException;
import org.apache.http.client.ClientProtocolException;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.AuthorizationException;
@@ -364,6 +366,7 @@ import com.sap.sailing.domain.leaderboard.caching.LeaderboardDTOCalculationReuse
import com.sap.sailing.domain.leaderboard.caching.LiveLeaderboardUpdater;
import com.sap.sailing.domain.leaderboard.impl.LeaderboardGroupImpl;
import com.sap.sailing.domain.leaderboard.meta.MetaLeaderboardColumn;
import com.sap.sailing.domain.orc.ORCPerformanceCurveRankingMetric;
import com.sap.sailing.domain.orc.ORCPublicCertificateDatabase;
import com.sap.sailing.domain.orc.ORCPublicCertificateDatabase.CertificateHandle;
import com.sap.sailing.domain.persistence.DomainObjectFactory;
@@ -382,6 +385,7 @@ import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapter;
import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapterFactory;
import com.sap.sailing.domain.racelogtracking.impl.DeviceMappingImpl;
import com.sap.sailing.domain.racelogtracking.impl.SmartphoneUUIDIdentifierImpl;
import com.sap.sailing.domain.ranking.RankingMetric;
import com.sap.sailing.domain.ranking.RankingMetric.RankingInfo;
import com.sap.sailing.domain.regattalike.HasRegattaLike;
import com.sap.sailing.domain.regattalike.IsRegattaLike;
@@ -3524,7 +3528,8 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet
}
private Double getCompetitorRaceDataEntry(DetailType dataType, TrackedRace trackedRace, Competitor competitor,
TimePoint timePoint, String leaderboardGroupName, String leaderboardName, WindLegTypeAndLegBearingAndORCPerformanceCurveCache cache) throws NoWindException {
TimePoint timePoint, String leaderboardGroupName, String leaderboardName,
WindLegTypeAndLegBearingAndORCPerformanceCurveCache cache) throws NoWindException {
Double result = null;
Course course = trackedRace.getRace().getCourse();
course.lockForRead(); // make sure the tracked leg survives this call even if a course update is pending
@@ -3596,6 +3601,20 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet
result = (distanceToLeader == null) ? null : distanceToLeader.getMeters();
}
break;
case RACE_IMPLIED_WIND:
final RankingMetric rankingMetric = trackedRace.getRankingMetric();
if (rankingMetric instanceof ORCPerformanceCurveRankingMetric) {
final ORCPerformanceCurveRankingMetric orcPcsRankingMetric =
(ORCPerformanceCurveRankingMetric) rankingMetric;
try {
final Speed impliedWind = orcPcsRankingMetric.getImpliedWind(competitor, timePoint, cache);
result = impliedWind.getKnots();
} catch (MaxIterationsExceededException | FunctionEvaluationException e) {
logger.log(Level.WARNING, "Problem computing implied wind", e);
result = null;
}
}
break;
case RACE_RANK:
if (trackedLeg != null) {
result = (double) trackedLeg.getRank(timePoint, cache);
@@ -8329,6 +8348,17 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet
availableDetailsTypes.addAll(DetailType.getRaceExtendedBravoDetailTypes());
availableDetailsTypes.addAll(DetailType.getRaceExpeditionDetailTypes());
}
final RankingMetrics rankingMetricType = trackedRace.getRankingMetric().getType();
switch (rankingMetricType) {
case ONE_DESIGN:
case TIME_ON_TIME_AND_DISTANCE:
break;
case ORC_PERFORMANCE_CURVE:
case ORC_PERFORMANCE_CURVE_BY_IMPLIED_WIND:
case ORC_PERFORMANCE_CURVE_LEADER_FOR_BASELINE:
availableDetailsTypes.addAll(DetailType.getAllOrcPerformanceCurveDetailTypes());
break;
}
}
if (leaderboardGroupName != null) {
final LeaderboardGroupDTO group = getLeaderboardGroupByName(leaderboardGroupName, false);
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResourceV2.java
+7
View File
@@ -305,6 +305,7 @@ public class LeaderboardsResourceV2 extends AbstractLeaderboardsResource {
DetailType.RACE_AVERAGE_SPEED_OVER_GROUND_IN_KNOTS,
DetailType.RACE_DISTANCE_TRAVELED,
DetailType.RACE_TIME_TRAVELED,
DetailType.RACE_IMPLIED_WIND,
DetailType.RACE_CURRENT_SPEED_OVER_GROUND_IN_KNOTS,
DetailType.RACE_CURRENT_COURSE_OVER_GROUND_IN_TRUE_DEGREES,
DetailType.RACE_CURRENT_POSITION_LAT_DEG,
@@ -362,6 +363,12 @@ public class LeaderboardsResourceV2 extends AbstractLeaderboardsResource {
value = timeTraveled.asSeconds();
}
break;
case RACE_IMPLIED_WIND:
name = "impliedWind-kts";
if (entry.impliedWind != null) {
value = entry.impliedWind.getKnots();
}
break;
case RACE_CURRENT_SPEED_OVER_GROUND_IN_KNOTS:
name = "currentSpeedOverGround-kts";
if (currentLegEntry != null && currentLegEntry.currentSpeedOverGroundInKnots != null) {