Skip to content

Commit c462bac

Browse files
committed
Merge branch 'main' into bug5959
2 parents 300d3d6 + ddc9a36 commit c462bac

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ Require-Bundle: junit-jupiter-api;bundle-version="5.11.3",
1919
net.bytebuddy.byte-buddy-agent;bundle-version="1.14.12",
2020
org.mockito.mockito-core;bundle-version="4.8.1"
2121
Automatic-Module-Name: com.sap.sailing.windestimation.test
22+
Import-Package: com.sap.sse.testutils

java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/integration/IncrementalMstHmmWindEstimationForTrackedRaceTest.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import static org.junit.jupiter.api.Assertions.assertTrue;
55

66
import java.io.File;
7+
import java.io.IOException;
78
import java.net.URI;
89
import java.net.URL;
910
import java.text.SimpleDateFormat;
@@ -51,7 +52,6 @@
5152
import com.sap.sailing.windestimation.data.RaceWithEstimationData;
5253
import com.sap.sailing.windestimation.data.WindQuality;
5354
import com.sap.sailing.windestimation.data.transformer.CompleteManeuverCurveWithEstimationDataToManeuverForEstimationTransformer;
54-
import com.sap.sailing.windestimation.model.exception.ModelPersistenceException;
5555
import com.sap.sailing.windestimation.model.regressor.twdtransition.DistanceBasedTwdTransitionRegressorModelContext.DistanceValueRange;
5656
import com.sap.sailing.windestimation.model.regressor.twdtransition.DurationBasedTwdTransitionRegressorModelContext.DurationValueRange;
5757
import com.sap.sailing.windestimation.model.store.ClassPathReadOnlyModelStoreImpl;
@@ -66,6 +66,9 @@
6666
import com.sap.sse.common.impl.DegreeBearingImpl;
6767
import com.sap.sse.common.impl.MillisecondsTimePoint;
6868
import com.sap.sse.shared.util.Wait;
69+
import com.sap.sse.testutils.Measurement;
70+
import com.sap.sse.testutils.MeasurementCase;
71+
import com.sap.sse.testutils.MeasurementXMLFile;
6972

7073
/**
7174
*
@@ -148,7 +151,7 @@ public void setUp() throws Exception {
148151
}
149152

150153
@Test
151-
public void testIncrementalMstHmmWindEstimationForTrackedRace() throws NoWindException, ModelPersistenceException {
154+
public void testIncrementalMstHmmWindEstimationForTrackedRace() throws NoWindException, IOException {
152155
assertTrue(windEstimationFactoryService.isReady(), "Wind estimation models are empty");
153156
DynamicTrackedRaceImpl trackedRace = getTrackedRace();
154157
WindTrack estimatedWindTrackOfTrackedRace = trackedRace
@@ -180,6 +183,9 @@ public void testIncrementalMstHmmWindEstimationForTrackedRace() throws NoWindExc
180183
new WindTrackCalculatorImpl(new MiddleCourseBasedTwdCalculatorImpl(),
181184
new DummyBasedTwsCalculatorImpl()));
182185
List<WindWithConfidence<Pair<Position, TimePoint>>> windFixes = targetWindEstimation.estimateWindTrack(race);
186+
final MeasurementXMLFile performanceReport = new MeasurementXMLFile(this.getClass());
187+
final MeasurementCase performanceReportCase = performanceReport.addCase(getClass().getSimpleName());
188+
performanceReportCase.addMeasurement(new Measurement("NumberOfTargetEstimationFixes", windFixes.size()));
183189
List<Wind> targetWindFixes = new ArrayList<>(windFixes.size());
184190
for (WindWithConfidence<Pair<Position, TimePoint>> windFix : windFixes) {
185191
Wind wind = windFix.getObject();
@@ -233,6 +239,7 @@ public int compare(Wind o1, Wind o2) {
233239
}
234240
assertTrue((double) foundCount / (double) targetWindFixes.size() > PERCENT_QUANTILE,
235241
"Expected ratio of matching fixes to be at least "+PERCENT_QUANTILE+" but was only "+(double) foundCount / (double) estimatedWindFixes.size());
242+
performanceReport.write();
236243
}
237244

238245
/**

0 commit comments

Comments
 (0)