eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-07 11:32:16 +00:00
Code Activity

Merge branch 'master' into permission-vertical

Browse Source 
Change-Id: I8d1fab815610c344e20db356fddc98c998e8f574
This commit is contained in:
Axel Uhl committed 2018-08-02 13:44:44 +02:00
2 parents 30f9e89993 51add11c47
commit 7819b39faa
413 files changed
+10171 -1589
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java
+5 -3
View File
@@ -170,8 +170,10 @@ public class PolarDataServiceImpl implements ReplicablePolarService, ClearStateT
if (closestTwsTwa == null) {
result = new Pair<>(0.0, null);
} else {
double minDiffDeg = Math.abs(Math.abs(Math.abs(closestTwsTwa.getObject().getBearing().getDegrees() * 2)
- Math.abs(courseChangeDeg)));
double targetManeuverAngle = getManeuverAngleInDegreesFromTwa(
closestTwsTwa.getObject().getBearing().getDegrees(), maneuverType);
double minDiffDeg = Math.abs(Math.abs(targetManeuverAngle)
- Math.abs(courseChangeDeg));
result = new Pair<>(1. / (1. + (minDiffDeg / 10.) * (minDiffDeg / 10.)), closestTwsTwa);
}
return result;
@@ -189,7 +191,7 @@ public class PolarDataServiceImpl implements ReplicablePolarService, ClearStateT
: courseChangeDeg >= 0 ? Tack.STARBOARD : Tack.PORT)) {
double targetManeuverAngle = getManeuverAngleInDegreesFromTwa(
trueWindSpeedAndAngle.getObject().getBearing().getDegrees(), type);
double diff = Math.abs(targetManeuverAngle) - Math.abs(courseChangeDeg);
double diff = Math.abs(Math.abs(targetManeuverAngle) - Math.abs(courseChangeDeg));
if (diff < minDiff) {
minDiff = diff;
closestTwsTwa = trueWindSpeedAndAngle;
java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java
+1 -1
View File
@@ -288,7 +288,7 @@ public class PolarDataMiner {
} else if (legType.equals(LegType.DOWNWIND)) {
CubicEquation downWindEquation = new CubicEquation(0.0003, -0.0373, 1.5213, -2.1309
- speedOverGround.getKnots());
int angle = 30 * tackFactor;
int angle = 150 * tackFactor;
solveAndAddResults(resultSet, downWindEquation, angle);
}
return resultSet;