diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java index 2b789fc8df2..42dfb171d4b 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java @@ -28,17 +28,19 @@ public class CubicRegressionPerCourseProcessor implements Processor element) { - GroupKey key = element.getKey(); - AngleAndSpeedRegression regression; - synchronized (regressions) { - regression = regressions.get(key); - if (regression == null) { - regression = new AngleAndSpeedRegression(); - regressions.put(key, regression); - } - } GPSFixMovingWithPolarContext fix = element.getDataEntry(); - regression.addData(fix.getWind(), fix.getAngleToTheWind(), fix.getBoatSpeed()); + if (fix.getLegType() == LegType.UPWIND || fix.getLegType() == LegType.DOWNWIND) { + GroupKey key = element.getKey(); + AngleAndSpeedRegression regression; + synchronized (regressions) { + regression = regressions.get(key); + if (regression == null) { + regression = new AngleAndSpeedRegression(); + regressions.put(key, regression); + } + } + regression.addData(fix.getWind(), fix.getAngleToTheWind(), fix.getBoatSpeed()); + } } public SpeedWithBearingWithConfidence getAverageSpeedAndCourseOverGround(BoatClass boatClass, Speed windSpeed, LegType legType, Tack tack) throws NotEnoughDataHasBeenAddedException { diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessorImpl.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessorImpl.java index a7cf39d026b..61d24338d84 100755 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessorImpl.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessorImpl.java @@ -52,35 +52,37 @@ public class MovingAverageProcessorImpl implements MovingAverageProcessor { @Override public void processElement(GroupedDataEntry element) { - GroupKey key = element.getKey(); - MovingAverageBoatSpeedEstimator boatSpeedEstimator; - synchronized (boatSpeedEstimators) { - boatSpeedEstimator = boatSpeedEstimators.get(key); - if (boatSpeedEstimator == null) { - boatSpeedEstimator = new MovingAverageBoatSpeedEstimator(); - boatSpeedEstimators.put(key, boatSpeedEstimator); - } - } - AverageAngleContainer averageAngleContainer; - synchronized (averageAngleContainers) { - averageAngleContainer = averageAngleContainers.get(key); - if (averageAngleContainer == null) { - averageAngleContainer = new AverageAngleContainer(); - averageAngleContainers.put(key, averageAngleContainer); - } - } GPSFixMovingWithPolarContext fix = element.getDataEntry(); - BearingWithConfidence angleToTheWind = fix.getAngleToTheWind(); - WindWithConfidence> windSpeed = fix.getWind(); - SpeedWithBearingWithConfidence boatSpeedWithConfidence = fix.getBoatSpeed(); - availableBoatClasses.add(element.getDataEntry().getBoatClass()); - WindWithConfidence> windWithConfidenceForSpeed = windSpeed; - double confidenceForWindSpeed = windWithConfidenceForSpeed.getConfidence(); - double confidenceForWindBearing = angleToTheWind.getConfidence(); - double confidenceForBoatSpeed = boatSpeedWithConfidence.getConfidence(); - double averagedConfidence = (confidenceForBoatSpeed + confidenceForWindBearing + confidenceForWindSpeed) / 3; - averageAngleContainer.addFix(angleToTheWind.getObject().getDegrees()); - boatSpeedEstimator.addData(boatSpeedWithConfidence.getObject(), averagedConfidence); + if (fix.getLegType() == LegType.UPWIND || fix.getLegType() == LegType.DOWNWIND) { + GroupKey key = element.getKey(); + MovingAverageBoatSpeedEstimator boatSpeedEstimator; + synchronized (boatSpeedEstimators) { + boatSpeedEstimator = boatSpeedEstimators.get(key); + if (boatSpeedEstimator == null) { + boatSpeedEstimator = new MovingAverageBoatSpeedEstimator(); + boatSpeedEstimators.put(key, boatSpeedEstimator); + } + } + AverageAngleContainer averageAngleContainer; + synchronized (averageAngleContainers) { + averageAngleContainer = averageAngleContainers.get(key); + if (averageAngleContainer == null) { + averageAngleContainer = new AverageAngleContainer(); + averageAngleContainers.put(key, averageAngleContainer); + } + } + BearingWithConfidence angleToTheWind = fix.getAngleToTheWind(); + WindWithConfidence> windSpeed = fix.getWind(); + SpeedWithBearingWithConfidence boatSpeedWithConfidence = fix.getBoatSpeed(); + availableBoatClasses.add(element.getDataEntry().getBoatClass()); + WindWithConfidence> windWithConfidenceForSpeed = windSpeed; + double confidenceForWindSpeed = windWithConfidenceForSpeed.getConfidence(); + double confidenceForWindBearing = angleToTheWind.getConfidence(); + double confidenceForBoatSpeed = boatSpeedWithConfidence.getConfidence(); + double averagedConfidence = (confidenceForBoatSpeed + confidenceForWindBearing + confidenceForWindSpeed) / 3; + averageAngleContainer.addFix(angleToTheWind.getObject().getDegrees()); + boatSpeedEstimator.addData(boatSpeedWithConfidence.getObject(), averagedConfidence); + } } @Override