diff --git a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages.properties b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages.properties index 51bf157b984..d04c8ae22a5 100644 --- a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages.properties +++ b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages.properties @@ -173,6 +173,8 @@ AvgTurningRateInDegreesPerSecond=Avg turning rate in deg/s ManeuverStartsByRunningAwayFromTheWind=Maneuver starts by running away from the wind RelativeBearingToNextMarkBeforeManeuver=Relative bearing to the next mark before maneuver RelativeBearingToNextMarkAfterManeuver=Relative bearing to the next mark after maneuver +AbsRelativeBearingToNextMarkBeforeManeuver=Abs. relative bearing to the next mark before maneuver +AbsRelativeBearingToNextMarkAfterManeuver=Abs. relative bearing to the next mark after maneuver RatioBetweenDistanceSailedWithAndWithoutManeuver=Ratio between distance sailed with and without maneuver RatioBetweenDistanceSailedTowardMiddleAngleProjectionWithAndWithoutManeuver=Ratio between distance sailed toward middle angle projection with and without maneuver DurationLostByManeuver=Duration lost by maneuver diff --git a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_de.properties b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_de.properties index d95d72c25cd..48884221d73 100644 --- a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_de.properties +++ b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_de.properties @@ -173,6 +173,8 @@ AvgTurningRateInDegreesPerSecond=Durchschnitliche Drehrate in deg/s ManeuverStartsByRunningAwayFromTheWind=Manöver beginnt in Abfall-Richtung RelativeBearingToNextMarkBeforeManeuver=Relative Richtung zur nächsten Marke vor dem Manöver RelativeBearingToNextMarkAfterManeuver=Relative Richtung zur nächsten Marke nach dem Manöver +AbsRelativeBearingToNextMarkBeforeManeuver=Abs. relative Richtung zur nächsten Marke vor dem Manöver +AbsRelativeBearingToNextMarkAfterManeuver=Abs. relative Richtung zur nächsten Marke nach dem Manöver RatioBetweenDistanceSailedWithAndWithoutManeuver=Verhältnis zwischen gesegelter Distanz mit und ohne Manövrierung RatioBetweenDistanceSailedTowardMiddleAngleProjectionWithAndWithoutManeuver=Verhältnis zwischen gesegelter Distanz von Mittelwinkel-Projektion mit und ohne Manövrierung DurationLostByManeuver=Verlorene Zeit diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasCompleteManeuverCurveWithEstimationDataContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasCompleteManeuverCurveWithEstimationDataContext.java index 36458df383d..2b4acb404bd 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasCompleteManeuverCurveWithEstimationDataContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasCompleteManeuverCurveWithEstimationDataContext.java @@ -101,6 +101,12 @@ public interface HasCompleteManeuverCurveWithEstimationDataContext { @Statistic(messageKey = "RelativeBearingToNextMarkAfterManeuver", resultDecimals = 1) Double getRelativeBearingToNextMarkAfterManeuver(); + + @Statistic(messageKey = "AbsRelativeBearingToNextMarkBeforeManeuver", resultDecimals = 1) + Double getAbsRelativeBearingToNextMarkBeforeManeuver(); + + @Statistic(messageKey = "AbsRelativeBearingToNextMarkAfterManeuver", resultDecimals = 1) + Double getAbsRelativeBearingToNextMarkAfterManeuver(); @Statistic(messageKey = "ManeuverEnteringSpeedInKnots", resultDecimals = 2) Double getManeuverEnteringSpeed(); diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/CompleteManeuverCurveWithEstimationDataWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/CompleteManeuverCurveWithEstimationDataWithContext.java index 6ef707e2b14..8e0d363e0c1 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/CompleteManeuverCurveWithEstimationDataWithContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/CompleteManeuverCurveWithEstimationDataWithContext.java @@ -282,4 +282,16 @@ public class CompleteManeuverCurveWithEstimationDataWithContext / maneuverWithEstimationData.getCurveWithUnstableCourseAndSpeed().getDuration().asSeconds(); } + @Override + public Double getAbsRelativeBearingToNextMarkBeforeManeuver() { + Double bearing = getRelativeBearingToNextMarkBeforeManeuver(); + return bearing == null ? null : Math.abs(bearing); + } + + @Override + public Double getAbsRelativeBearingToNextMarkAfterManeuver() { + Double bearing = getRelativeBearingToNextMarkAfterManeuver(); + return bearing == null ? null : Math.abs(bearing); + } + }