Split wind estimation in estimation and training/evaluation project

.gitignore

@@ -35,3 +35,4 @@ git.xml
 mobile/github-advrecyclerview_lib/bin
 captures
 /.recommenders/
+/java/.recommenders/

java/com.sap.sailing.windestimation.lab/.classpath

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/com.sap.sailing.windestimation"/>
+	<classpathentry kind="lib" path="/com.sap.sailing.windestimation/lib/com.github.haifengl.smile-core-1.5.1.jar"/>
+	<classpathentry kind="lib" path="/com.sap.sailing.windestimation/lib/com.github.haifengl.smile-data-1.5.1.jar"/>
+	<classpathentry kind="lib" path="/com.sap.sailing.windestimation/lib/com.github.haifengl.smile-graph-1.5.1.jar"/>
+	<classpathentry kind="lib" path="/com.sap.sailing.windestimation/lib/com.github.haifengl.smile-math-1.5.1.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

java/com.sap.sailing.windestimation.lab/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.sap.sailing.windestimation.lab</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

java/com.sap.sailing.windestimation.lab/META-INF/MANIFEST.MF

@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Windestimation Lab
+Bundle-SymbolicName: com.sap.sailing.windestimation.lab
+Fragment-Host: com.sap.sailing.windestimation
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: SAP
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: com.sap.sailing.windestimation.lab

java/com.sap.sailing.windestimation.lab/build.properties

@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .

java/com.sap.sailing.windestimation.lab/pom.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>root</artifactId>
+    <groupId>com.sap.sailing</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>com.sap.sailing.windestimation.lab</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/importer/CompleteManeuverCurveWithEstimationDataImporter.java

@@ -34,9 +34,9 @@ import com.sap.sailing.windestimation.data.CompetitorTrackWithEstimationData;
 import com.sap.sailing.windestimation.data.deserializer.CompetitorTrackWithEstimationDataJsonDeserializer;
 import com.sap.sailing.windestimation.data.deserializer.ManeuverForDataAnalysisJsonSerializer;
 import com.sap.sailing.windestimation.data.deserializer.ManeuverForEstimationJsonSerializer;
-import com.sap.sailing.windestimation.data.persistence.RaceWithCompleteManeuverCurvePersistenceManager;
-import com.sap.sailing.windestimation.data.persistence.RaceWithManeuverForDataAnalysisPersistenceManager;
-import com.sap.sailing.windestimation.data.persistence.RaceWithManeuverForEstimationPersistenceManager;
+import com.sap.sailing.windestimation.data.persistence.maneuver.RaceWithCompleteManeuverCurvePersistenceManager;
+import com.sap.sailing.windestimation.data.persistence.maneuver.RaceWithManeuverForDataAnalysisPersistenceManager;
+import com.sap.sailing.windestimation.data.persistence.maneuver.RaceWithManeuverForEstimationPersistenceManager;
 import com.sap.sailing.windestimation.data.transformer.AbstractCompleteManeuverCurveWithEstimationDataTransformer;
 import com.sap.sailing.windestimation.data.transformer.ManeuverForDataAnalysisTransformer;
 import com.sap.sailing.windestimation.data.transformer.ManeuverForEstimationTransformer;

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/AbstractPersistenceManager.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.net.UnknownHostException;
 import java.util.ArrayList;

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/AbstractRaceWithEstimationDataPersistenceManager.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.net.UnknownHostException;
 import java.util.ArrayList;

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/AbstractTransformedManeuversForDataAnalysisPersistenceManager.java

@@ -1,10 +1,12 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.net.UnknownHostException;
 
 import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
 import com.sap.sailing.windestimation.data.ManeuverForDataAnalysis;
 import com.sap.sailing.windestimation.data.deserializer.ManeuverForDataAnalysisJsonDeserializer;
+import com.sap.sailing.windestimation.data.persistence.maneuver.AbstractTransformedManeuversPersistenceManager;
+import com.sap.sailing.windestimation.data.persistence.maneuver.PersistenceManager;
 
 public abstract class AbstractTransformedManeuversForDataAnalysisPersistenceManager
         extends AbstractTransformedManeuversPersistenceManager<ManeuverForDataAnalysis> {

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/AbstractTransformedManeuversForEstimationPersistenceManager.java

@@ -1,10 +1,12 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.net.UnknownHostException;
 
 import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
 import com.sap.sailing.windestimation.data.ManeuverForEstimation;
 import com.sap.sailing.windestimation.data.deserializer.ManeuverForEstimationJsonDeserializer;
+import com.sap.sailing.windestimation.data.persistence.maneuver.AbstractTransformedManeuversPersistenceManager;
+import com.sap.sailing.windestimation.data.persistence.maneuver.PersistenceManager;
 
 public abstract class AbstractTransformedManeuversForEstimationPersistenceManager
         extends AbstractTransformedManeuversPersistenceManager<ManeuverForEstimation> {

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/AbstractTransformedManeuversPersistenceManager.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.net.UnknownHostException;
 

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/ManeuverForDataAnalysisPersistenceManager.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.net.UnknownHostException;
 

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/ManeuverForEstimationPersistenceManager.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.net.UnknownHostException;
 

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/PenaltyCircleManeuverForDataAnalysisPersistenceManager.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.net.UnknownHostException;
 

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/PenaltyCircleManeuverForEstimationPersistenceManager.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.net.UnknownHostException;
 

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/PersistedElementsIterator.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.util.Iterator;
 

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/PersistenceManager.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.util.List;
 

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/RaceWithCompleteManeuverCurvePersistenceManager.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.net.UnknownHostException;
 

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/RaceWithEstimationDataPersistenceManager.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.util.Iterator;
 import java.util.List;

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/RaceWithManeuverForDataAnalysisPersistenceManager.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.net.UnknownHostException;
 
@@ -6,6 +6,7 @@ import com.sap.sailing.server.gateway.deserialization.impl.DetailedBoatClassJson
 import com.sap.sailing.windestimation.data.ManeuverForDataAnalysis;
 import com.sap.sailing.windestimation.data.deserializer.CompetitorTrackWithEstimationDataJsonDeserializer;
 import com.sap.sailing.windestimation.data.deserializer.ManeuverForDataAnalysisJsonDeserializer;
+import com.sap.sailing.windestimation.data.persistence.maneuver.AbstractRaceWithEstimationDataPersistenceManager;
 
 /**
  * 

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/RaceWithManeuverForEstimationPersistenceManager.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.net.UnknownHostException;
 
@@ -6,6 +6,7 @@ import com.sap.sailing.server.gateway.deserialization.impl.DetailedBoatClassJson
 import com.sap.sailing.windestimation.data.ManeuverForEstimation;
 import com.sap.sailing.windestimation.data.deserializer.CompetitorTrackWithEstimationDataJsonDeserializer;
 import com.sap.sailing.windestimation.data.deserializer.ManeuverForEstimationJsonDeserializer;
+import com.sap.sailing.windestimation.data.persistence.maneuver.AbstractRaceWithEstimationDataPersistenceManager;
 
 /**
  * 

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/RegularManeuverWithMarkPassingForDataAnalysisPersistenceManager.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.net.UnknownHostException;
 

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/RegularManeuverWithoutMarkPassingForDataAnalysisPersistenceManager.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.net.UnknownHostException;
 

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/RegularManeuversForEstimationPersistenceManager.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 import java.net.UnknownHostException;
 

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/maneuver/TransformedManeuversPersistenceManager.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.maneuver;
 
 public interface TransformedManeuversPersistenceManager<T> extends PersistenceManager<T> {
 

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/data/persistence/polars/PolarDataServiceAccessUtil.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.windestimation.data.persistence;
+package com.sap.sailing.windestimation.data.persistence.polars;
 
 import java.io.File;
 import java.io.FileInputStream;

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/evaluation/WindEstimatorEvaluationRunner.java

@@ -5,15 +5,15 @@ import java.lang.reflect.Field;
 import com.sap.sailing.domain.maneuverdetection.CompleteManeuverCurveWithEstimationData;
 import com.sap.sailing.domain.polars.PolarDataService;
 import com.sap.sailing.windestimation.data.RaceWithEstimationData;
-import com.sap.sailing.windestimation.data.persistence.PersistedElementsIterator;
-import com.sap.sailing.windestimation.data.persistence.PolarDataServiceAccessUtil;
-import com.sap.sailing.windestimation.data.persistence.RaceWithCompleteManeuverCurvePersistenceManager;
+import com.sap.sailing.windestimation.data.persistence.maneuver.PersistedElementsIterator;
+import com.sap.sailing.windestimation.data.persistence.maneuver.RaceWithCompleteManeuverCurvePersistenceManager;
+import com.sap.sailing.windestimation.data.persistence.polars.PolarDataServiceAccessUtil;
 import com.sap.sailing.windestimation.maneuverclassifier.ManeuverFeatures;
 import com.sap.sailing.windestimation.util.LoggingUtil;
 
 public class WindEstimatorEvaluationRunner {
 
-    private static final Integer MAX_RACES = null;
+    private static final Integer MAX_RACES = 10;
     private static final Integer FIXED_NUMBER_OF_MANEUVERS = null;
     private static final boolean RANDOM_CLIPPING_OF_COMPETITOR_TRACKS = false;
     private static final boolean EVALUATE_PER_COMPETITOR_TRACK = false;

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/evaluation/WindEstimatorFactories.java

@@ -4,8 +4,8 @@ import com.sap.sailing.domain.maneuverdetection.CompleteManeuverCurveWithEstimat
 import com.sap.sailing.domain.polars.PolarDataService;
 import com.sap.sailing.windestimation.PolarsFittingBasedWindEstimationComponentImpl;
 import com.sap.sailing.windestimation.SimpleConfigurableManeuverBasedWindEstimationComponentImpl;
-import com.sap.sailing.windestimation.SimpleConfigurableManeuverBasedWindEstimationComponentImpl.ManeuverClassificationsAggregatorImplementation;
 import com.sap.sailing.windestimation.WindEstimationComponent;
+import com.sap.sailing.windestimation.SimpleConfigurableManeuverBasedWindEstimationComponentImpl.ManeuverClassificationsAggregatorImplementation;
 import com.sap.sailing.windestimation.data.RaceWithEstimationData;
 import com.sap.sailing.windestimation.maneuverclassifier.ManeuverFeatures;
 import com.sap.sailing.windestimation.preprocessing.RaceElementsFilteringPreprocessingPipelineImpl;

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/evaluation/WindEstimatorManeuverNumberDependentEvaluationRunner.java

@@ -8,9 +8,9 @@ import java.lang.reflect.Field;
 import com.sap.sailing.domain.maneuverdetection.CompleteManeuverCurveWithEstimationData;
 import com.sap.sailing.domain.polars.PolarDataService;
 import com.sap.sailing.windestimation.data.RaceWithEstimationData;
-import com.sap.sailing.windestimation.data.persistence.PersistedElementsIterator;
-import com.sap.sailing.windestimation.data.persistence.PolarDataServiceAccessUtil;
-import com.sap.sailing.windestimation.data.persistence.RaceWithCompleteManeuverCurvePersistenceManager;
+import com.sap.sailing.windestimation.data.persistence.maneuver.PersistedElementsIterator;
+import com.sap.sailing.windestimation.data.persistence.maneuver.RaceWithCompleteManeuverCurvePersistenceManager;
+import com.sap.sailing.windestimation.data.persistence.polars.PolarDataServiceAccessUtil;
 import com.sap.sailing.windestimation.maneuverclassifier.ManeuverFeatures;
 import com.sap.sailing.windestimation.util.LoggingUtil;
 

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/maneuverclassifier/ManeuverClassifierTrainer.java

@@ -13,9 +13,9 @@ import com.sap.sailing.domain.base.BoatClass;
 import com.sap.sailing.domain.polars.PolarDataService;
 import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
 import com.sap.sailing.windestimation.data.ManeuverForEstimation;
-import com.sap.sailing.windestimation.data.persistence.PolarDataServiceAccessUtil;
-import com.sap.sailing.windestimation.data.persistence.RegularManeuversForEstimationPersistenceManager;
-import com.sap.sailing.windestimation.data.persistence.TransformedManeuversPersistenceManager;
+import com.sap.sailing.windestimation.data.persistence.maneuver.RegularManeuversForEstimationPersistenceManager;
+import com.sap.sailing.windestimation.data.persistence.maneuver.TransformedManeuversPersistenceManager;
+import com.sap.sailing.windestimation.data.persistence.polars.PolarDataServiceAccessUtil;
 import com.sap.sailing.windestimation.util.LoggingUtil;
 import com.sap.sse.common.Util.Pair;
 

java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/maneuverclassifier/PersistedManeuverClassifiersScorePrinter.java

@@ -12,7 +12,7 @@ import java.util.regex.Pattern;
 
 import com.sap.sailing.domain.base.BoatClass;
 import com.sap.sailing.domain.polars.PolarDataService;
-import com.sap.sailing.windestimation.data.persistence.PolarDataServiceAccessUtil;
+import com.sap.sailing.windestimation.data.persistence.polars.PolarDataServiceAccessUtil;
 import com.sap.sailing.windestimation.util.LoggingUtil;
 
 public class PersistedManeuverClassifiersScorePrinter {

java/com.sap.sailing.windestimation.test/.classpath

@@ -4,5 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="resources"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/com.sap.sailing.windestimation"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

java/com.sap.sailing.windestimation.test/META-INF/MANIFEST.MF

@@ -6,23 +6,6 @@ Fragment-Host: com.sap.sailing.windestimation
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.osgi.framework;version="1.5.0"
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.osgi;bundle-version="3.10.1",
- org.json.simple;bundle-version="1.1.0",
- org.mongodb.mongo-java-driver;bundle-version="2.13.0",
- org.apache.httpcomponents.httpclient;bundle-version="[4.2.5,4.3.0)",
- org.apache.httpcomponents.httpcore;bundle-version="[4.0.0,4.3.0)",
- com.sap.sse;bundle-version="1.0.0",
- com.sap.sse.common;bundle-version="1.0.0",
- com.sap.sailing.domain;bundle-version="1.0.0",
- com.sap.sailing.domain.shared.android,
- com.sap.sailing.domain.common;bundle-version="1.0.0",
- com.sap.sailing.server.gateway.serialization;bundle-version="1.0.0",
- com.sap.sailing.server.gateway.serialization.shared.android;bundle-version="1.0.0",
- com.sap.sailing.polars,
- org.apache.commons.io,
- com.sap.sse.replication,
- org.junit;bundle-version="4.8.2",
- slf4j.api
-Automatic-Module-Name: com.sap.sailing.velum.resultimport.test
+Require-Bundle: org.junit;bundle-version="4.8.2"
+Automatic-Module-Name: com.sap.sailing.windestimation.test

java/com.sap.sailing.windestimation/META-INF/MANIFEST.MF

@@ -29,3 +29,4 @@ Bundle-ClassPath: lib/com.github.haifengl.smile-core-1.5.1.jar,
  lib/com.github.haifengl.smile-graph-1.5.1.jar,
  lib/com.github.haifengl.smile-math-1.5.1.jar,
  .
+Automatic-Module-Name: com.sap.sailing.windestimation