mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-16 07:10:48 +00:00
Only add data to polar regression container if upwind or downwind legtype
this does not apply to the Container which groups the fixes by true wind angle cluster
This commit is contained in:
1 parent
86bfd9aeb6
commit
c8bd8b0ab2
2 files changed
+42
-38
No files matched your search
+12
-10
@@ -28,17 +28,19 @@ public class CubicRegressionPerCourseProcessor implements Processor<GroupedDataE
|
||||
|
||||
@Override
|
||||
public void processElement(GroupedDataEntry<GPSFixMovingWithPolarContext> 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<Void> getAverageSpeedAndCourseOverGround(BoatClass boatClass, Speed windSpeed, LegType legType, Tack tack) throws NotEnoughDataHasBeenAddedException {
|
||||
|
||||
+30
-28
@@ -52,35 +52,37 @@ public class MovingAverageProcessorImpl implements MovingAverageProcessor {
|
||||
|
||||
@Override
|
||||
public void processElement(GroupedDataEntry<GPSFixMovingWithPolarContext> 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<Integer> angleToTheWind = fix.getAngleToTheWind();
|
||||
WindWithConfidence<Pair<Position, TimePoint>> windSpeed = fix.getWind();
|
||||
SpeedWithBearingWithConfidence<TimePoint> boatSpeedWithConfidence = fix.getBoatSpeed();
|
||||
availableBoatClasses.add(element.getDataEntry().getBoatClass());
|
||||
WindWithConfidence<Pair<Position, TimePoint>> 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<Integer> angleToTheWind = fix.getAngleToTheWind();
|
||||
WindWithConfidence<Pair<Position, TimePoint>> windSpeed = fix.getWind();
|
||||
SpeedWithBearingWithConfidence<TimePoint> boatSpeedWithConfidence = fix.getBoatSpeed();
|
||||
availableBoatClasses.add(element.getDataEntry().getBoatClass());
|
||||
WindWithConfidence<Pair<Position, TimePoint>> 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
|
||||
|
||||
Reference in new issue
Block a user