From f11c5348922b37ad5dc6cf21d3e2dbfaf6b8c2a3 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Thu, 28 May 2015 14:33:09 +0200 Subject: [PATCH] compute current VMG only if average VMG is not available --- .../com/sap/sailing/domain/ranking/AbstractRankingMetric.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/AbstractRankingMetric.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/AbstractRankingMetric.java index 276ba03d9b9..bf69509a249 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/AbstractRankingMetric.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/AbstractRankingMetric.java @@ -454,9 +454,8 @@ public abstract class AbstractRankingMetric implements RankingMetric { private Duration getDurationToReach(final Position windwardPositionToReachInWhosCurrentLeg, TimePoint timePoint, final TrackedLegOfCompetitor whosLeg, WindLegTypeAndLegBearingCache cache) { final Duration toEndOfLegOrTo; - final Speed currentVMG = whosLeg.getVelocityMadeGood(timePoint, WindPositionMode.EXACT, cache); final Speed averageVMG = whosLeg.getAverageVelocityMadeGood(timePoint, cache); - final Speed vmg = Double.isNaN(averageVMG.getKnots()) ? currentVMG : averageVMG; + final Speed vmg = Double.isNaN(averageVMG.getKnots()) ? /* default to current VMG */ whosLeg.getVelocityMadeGood(timePoint, WindPositionMode.EXACT, cache) : averageVMG; toEndOfLegOrTo = vmg.getDuration( whosLeg.getTrackedLeg().getWindwardDistance( getTrackedRace().getTrack(whosLeg.getCompetitor()).getEstimatedPosition(timePoint, /* extrapolate */true),