eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-14 06:18:12 +00:00
Code Activity

Switched back BEAR AWAY + HEAD UP grouping as OTHER maneuver type for

Browse Source 
classification + bugfixed boat class filtering for classifier training
This commit is contained in:
Vladislav Chumak committed 2019-01-08 13:42:59 +01:00
1 parent 10f7da1183
commit 12842c7d55
3 files changed
+25 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/model/classifier/maneuver/ManeuverClassifierScoring.java
+17 -4
View File
@@ -1,16 +1,29 @@
package com.sap.sailing.windestimation.model.classifier.maneuver;
import com.sap.sailing.windestimation.data.ManeuverForEstimation;
import com.sap.sailing.windestimation.data.ManeuverTypeForClassification;
import com.sap.sailing.windestimation.model.classifier.ClassifierScoring;
import com.sap.sailing.windestimation.model.classifier.TrainableClassificationModel;
import com.sap.sailing.windestimation.model.classifier.maneuver.ManeuverClassifierModelMetadata;
public class ManeuverClassifierScoring extends ClassifierScoring<ManeuverForEstimation, ManeuverClassifierModelMetadata> {
public class ManeuverClassifierScoring
extends ClassifierScoring<ManeuverForEstimation, ManeuverClassifierModelMetadata> {
public ManeuverClassifierScoring(
TrainableClassificationModel<ManeuverForEstimation, ManeuverClassifierModelMetadata> trainedClassifierModel) {
super(trainedClassifierModel, i -> trainedClassifierModel.getContextSpecificModelMetadata()
.getManeuverTypeByMappingIndex(i).toString());
super(trainedClassifierModel, i -> {
ManeuverClassifierModelMetadata modelMetadata = trainedClassifierModel.getContextSpecificModelMetadata();
ManeuverTypeForClassification maneuverType = trainedClassifierModel.getContextSpecificModelMetadata()
.getManeuverTypeByMappingIndex(i);
if (modelMetadata.getOtherTypes() <= 1) {
return maneuverType.toString();
}
int otherTypesBeginFromOrdinal = ManeuverTypeForClassification.values().length
- modelMetadata.getOtherTypes();
if (maneuverType.ordinal() < otherTypesBeginFromOrdinal) {
return maneuverType.toString();
}
return "Other";
});
}
}
java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/model/classifier/maneuver/ManeuverClassifierModelFactory.java
+1 -2
View File
@@ -15,8 +15,7 @@ public class ManeuverClassifierModelFactory
implements ClassifierModelFactory<ManeuverForEstimation, ManeuverClassifierModelMetadata> {
public static final ManeuverTypeForClassification[] orderedSupportedTargetValues = {
ManeuverTypeForClassification.TACK, ManeuverTypeForClassification.JIBE,
ManeuverTypeForClassification.HEAD_UP, ManeuverTypeForClassification.BEAR_AWAY };
ManeuverTypeForClassification.TACK, ManeuverTypeForClassification.JIBE };
@Override
public TrainableClassificationModel<ManeuverForEstimation, ManeuverClassifierModelMetadata> getNewModel(
java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/model/classifier/maneuver/ManeuverClassifierModelMetadata.java
+7 -4
View File
@@ -119,6 +119,10 @@ public class ManeuverClassifierModelMetadata extends ContextSpecificModelMetadat
}
return null;
}
public int getOtherTypes() {
return otherTypes;
}
@Override
public double[] getX(ManeuverForEstimation maneuver) {
@@ -168,11 +172,10 @@ public class ManeuverClassifierModelMetadata extends ContextSpecificModelMetadat
return false;
}
}
if (maneuverFeatures.isMarksInformation()) {
return maneuver.isMarkPassingDataAvailable();
if (maneuverFeatures.isMarksInformation() && !maneuver.isMarkPassingDataAvailable()) {
return false;
}
if (boatClass != null && (maneuver.getBoatClass() == null
|| !boatClass.getName().equals(maneuver.getBoatClass().getName()))) {
if (boatClass != null && !boatClass.equals(maneuver.getBoatClass())) {
return false;
}
return true;