From c52185a913febc412edff78511001390c8282eb4 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Wed, 7 Mar 2018 22:35:36 +0100 Subject: [PATCH] removed now obsolete check for previous leg before computing maneuver loss Change-Id: Ie23523e9b7dad96c4c2fb39c5e3da469d619e5f8 --- .../impl/ManeuverDetectorImpl.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverDetectorImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverDetectorImpl.java index cdb24d895de..fb859dcee40 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverDetectorImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverDetectorImpl.java @@ -502,10 +502,8 @@ public class ManeuverDetectorImpl implements ManeuverDetector { refinedPenaltyDetails = computeManeuverDetails(refinedPenaltyMainCurveDetails, maneuverDetails.getTimePointBefore(), firstPenaltyCircleCompletedAt); } - if (legBeforeManeuver != null) { - maneuverLoss = getManeuverLoss(maneuverDetails.getTimePointBefore(), - maneuverDetails.getTimePoint(), firstPenaltyCircleCompletedAt); - } + maneuverLoss = getManeuverLoss(maneuverDetails.getTimePointBefore(), + maneuverDetails.getTimePoint(), firstPenaltyCircleCompletedAt); Position penaltyPosition = competitorTrack.getEstimatedPosition(refinedPenaltyDetails.getTimePoint(), /* extrapolate */ false); final Maneuver maneuver = new ManeuverWithStableSpeedAndCourseBoundariesImpl(maneuverType, @@ -525,10 +523,8 @@ public class ManeuverDetectorImpl implements ManeuverDetector { final Maneuver maneuver; if (numberOfTacks > 0 || numberOfJibes > 0) { maneuverType = numberOfTacks > 0 ? ManeuverType.TACK : ManeuverType.JIBE; - if (legBeforeManeuver != null) { - maneuverLoss = getManeuverLoss(maneuverDetails.getTimePointBefore(), - maneuverDetails.getTimePoint(), maneuverDetails.getTimePointAfter()); - } + maneuverLoss = getManeuverLoss(maneuverDetails.getTimePointBefore(), + maneuverDetails.getTimePoint(), maneuverDetails.getTimePointAfter()); maneuver = new ManeuverWithStableSpeedAndCourseBoundariesImpl(maneuverType, tackAfterManeuver, maneuverPosition, maneuverLoss, maneuverDetails.getTimePoint(), maneuverMainCurveDetails.extractEnteringAndExistingDetailsOnly(), @@ -553,10 +549,8 @@ public class ManeuverDetectorImpl implements ManeuverDetector { } else { // no wind information; marking as UNKNOWN maneuverType = ManeuverType.UNKNOWN; - if (legBeforeManeuver != null) { - maneuverLoss = getManeuverLoss(maneuverDetails.getTimePointBefore(), - maneuverDetails.getTimePoint(), maneuverDetails.getTimePointAfter()); - } + maneuverLoss = getManeuverLoss(maneuverDetails.getTimePointBefore(), + maneuverDetails.getTimePoint(), maneuverDetails.getTimePointAfter()); maneuver = new ManeuverWithStableSpeedAndCourseBoundariesImpl(maneuverType, tackAfterManeuver, maneuverPosition, maneuverLoss, maneuverDetails.getTimePoint(), maneuverMainCurveDetails.extractEnteringAndExistingDetailsOnly(),