diff --git a/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/LabelledTwdTransition.java b/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/LabelledTwdTransition.java index 898987d3e7c..a9848a31f9a 100644 --- a/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/LabelledTwdTransition.java +++ b/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/LabelledTwdTransition.java @@ -25,4 +25,10 @@ public class LabelledTwdTransition extends TwdTransition { return testDataset; } + @Override + public String toString() { + return "LabelledTwdTransition [correct=" + correct + ", testDataset=" + testDataset + ", " + super.toString() + + "]"; + } + } diff --git a/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/model/classifier/twdtransition/TwdTransitionClassifierTrainer.java b/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/model/classifier/twdtransition/TwdTransitionClassifierTrainer.java index 120e6eed47f..e6b62a7f6fd 100644 --- a/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/model/classifier/twdtransition/TwdTransitionClassifierTrainer.java +++ b/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/model/classifier/twdtransition/TwdTransitionClassifierTrainer.java @@ -93,7 +93,7 @@ public class TwdTransitionClassifierTrainer { LoggingUtil.logInfo("Converting dataset to array..."); while (iterator.hasNext()) { TwdTransition twdTransition = iterator.next(); - x[i][0] = modelMetadata.getX(twdTransition)[0]; + x[i][0] = modelMetadata.getXAsSingleValue(twdTransition); y[i] = labelExtraction.getY(twdTransition); i++; } diff --git a/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/data/ManeuverTransition.java b/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/data/ManeuverTransition.java index 80d982185f0..087b35ecd9e 100644 --- a/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/data/ManeuverTransition.java +++ b/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/data/ManeuverTransition.java @@ -34,4 +34,10 @@ public class ManeuverTransition { return toManeuverType; } + @Override + public String toString() { + return "ManeuverTransition [distance=" + distance + ", duration=" + duration + ", fromManeuverType=" + + fromManeuverType + ", toManeuverType=" + toManeuverType + "]"; + } + } diff --git a/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/data/TwdTransition.java b/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/data/TwdTransition.java index 888274f19d6..feddbc05fbd 100644 --- a/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/data/TwdTransition.java +++ b/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/data/TwdTransition.java @@ -18,4 +18,11 @@ public class TwdTransition extends ManeuverTransition { return twdChange; } + @Override + public String toString() { + return "TwdTransition [twdChange=" + twdChange + ", " + super.toString() + "]"; + } + + + } diff --git a/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/model/classifier/twdtransition/TwdTransitionClassifierModelMetadata.java b/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/model/classifier/twdtransition/TwdTransitionClassifierModelMetadata.java index a8c659db33e..63f4f8944eb 100644 --- a/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/model/classifier/twdtransition/TwdTransitionClassifierModelMetadata.java +++ b/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/model/classifier/twdtransition/TwdTransitionClassifierModelMetadata.java @@ -16,10 +16,14 @@ public class TwdTransitionClassifierModelMetadata extends ContextSpecificModelMe @Override public double[] getX(TwdTransition instance) { - double[] x = new double[] { instance.getTwdChange().getDegrees() }; + double[] x = new double[] { getXAsSingleValue(instance) }; return x; } + public double getXAsSingleValue(TwdTransition instance) { + return instance.getTwdChange().getDegrees(); + } + @Override public boolean isContainsAllFeatures(TwdTransition instance) { return true;