added tack and jibe likelihood to debug output

This commit is contained in:
Axel Uhl committed 2015-01-22 17:58:17 +01:00
1 parent 2fd875e99e
commit 70ad5b33de
2 files changed
+10 -3

No files matched your search

@@ -100,7 +100,10 @@ public class TestWindEstimationFromManeuversOnAFew505Races extends OnlineTracTra
IntStream.range(0, numberOfClusters/2).mapToObj((i)->
new Pair<>(new DegreeBearingImpl(((double) i)*360./(double) numberOfClusters/2), -45.))));
final Set<Cluster<ManeuverClassification, Pair<ScalableBearing, ScalableDouble>, Pair<Bearing, Double>, ScalableBearingAndScalableDouble>> clusters = clusterer.getClusters();
assertEquals(8, clusters.size());
assertEquals(16, clusters.size());
// Now work towards identifying the two tack clusters
}
private Wind getManeuverBasedAverageWind() throws NotEnoughDataHasBeenAddedException {
@@ -240,11 +240,11 @@ public class ManeuverBasedWindEstimationTrackImpl extends WindTrackImpl {
}
public String getManeuverClassificationColumnHeaders() {
return "datapoint\tcompetitor\ttimePoint\tangleDeg\tboatSpeedKn\tcogDeg\tmiddleManeuverCourse\tlossM";
return "datapoint\tcompetitor\ttimePoint\tangleDeg\tboatSpeedKn\tcogDeg\tmiddleManeuverCourse\tlossM\ttackLikelihood\tjibeLikelihood";
}
public String getManeuverClassificationColumnTypes() {
return "infoitem\tstring\tdate\tfloat\tfloat\tfloat\tfloat\tfloat";
return "infoitem\tstring\tdate\tfloat\tfloat\tfloat\tfloat\tfloat\tfloat\tfloat";
}
public String format(ManeuverClassification mc, String id) {
@@ -263,6 +263,10 @@ public class ManeuverBasedWindEstimationTrackImpl extends WindTrackImpl {
result.append(mc.getMiddleManeuverCourse().getDegrees());
result.append("\t");
result.append(mc.getManeuverLoss() == null ? 0.0 : mc.getManeuverLoss().getMeters());
result.append("\t");
result.append(mc.getLikelihoodAndTWSBasedOnSpeedAndAngle(ManeuverType.TACK).getA());
result.append("\t");
result.append(mc.getLikelihoodAndTWSBasedOnSpeedAndAngle(ManeuverType.JIBE).getA());
return result.toString();
}