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

Merge branch 'main' into bug6214

Browse Source
This commit is contained in:
Axel Uhl committed 2026-03-25 17:15:13 +01:00
2 parents 1c3edb89bd bbc8d9d6ed
commit b6fe5297f0
14 files changed
+142 -55
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.amazon.aws.aws-java-api/createLocalAwsApiP2Repository.sh
+2 -2
View File
@@ -88,7 +88,7 @@ echo "Building the wrapper bundle..."
cd ..
echo "NOT USING ${extra} arguments for Maven to avoid using local target definition already for building local repo"
echo "In folder $(pwd) using: mvn clean install"
mvn --batch-mode clean install
JAVA_HOME=${JAVA8_HOME} mvn --batch-mode clean install
mkdir -p ${UPDATE_SITE_PROJECT}/plugins/aws-sdk
rm -rf ${UPDATE_SITE_PROJECT}/plugins/aws-sdk/*
# Note: the JAR ends up in target/ because the SDK project does not use any parent pom, so
@@ -128,7 +128,7 @@ echo "Patching update site's site.xml..."
sed -i -e 's/com.amazon.aws.aws-java-api\(\.source\)\?_\([0-9.]*\)\.jar/com.amazon.aws.aws-java-api\1_'${VERSION}'.jar/' -e '/feature url=/s/version="[0-9.]*"/version="'${VERSION}'"/' ${SITE_XML}
echo "Building update site..."
echo "In folder $(pwd) using: mvn ${extra} clean install"
mvn ${extra} clean install
JAVA_HOME=${JAVA8_HOME} mvn ${extra} clean install
echo "Patching SDK version ${VERSION} in target platform definition ${TARGET_DEFINITION}..."
sed -i -e 's/<unit id="com.amazon.aws.aws-java-api.feature.group" version="[0-9.]*"\/>/<unit id="com.amazon.aws.aws-java-api.feature.group" version="'${VERSION}'"\/>/' ${TARGET_DEFINITION}
echo "You may test your target platform locally by creating race-analysis-p2-local.target by running the script createLocalTargetDef.sh."
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/impl/MongoSensorFixStoreImpl.java
+2 -1
View File
@@ -132,7 +132,8 @@ public class MongoSensorFixStoreImpl extends MongoFixHandler implements MongoSen
public <FixT extends Timed> void loadFixes(Consumer<FixT> consumer, DeviceIdentifier device, TimePoint from,
TimePoint to, boolean inclusive, BooleanSupplier isPreemptiveStopped, Consumer<Double> progressConsumer)
throws NoCorrespondingServiceRegisteredException, TransformationException {
loadFixes(consumer, device, from, to, inclusive, isPreemptiveStopped, progressConsumer, true, false);
loadFixes(consumer, device, from, to, inclusive, isPreemptiveStopped, progressConsumer,
/* ascending */ true, /* only one result */ false);
}
private <FixT extends Timed> boolean loadFixes(Consumer<FixT> consumer, DeviceIdentifier device, TimePoint from,
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseChangeBasedTrackApproximationTest.java
+57
View File
@@ -4,6 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.NoSuchElementException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -40,6 +42,61 @@ public class CourseChangeBasedTrackApproximationTest {
approximation = new CourseChangeBasedTrackApproximation(track, competitor.getBoat().getBoatClass(), /* logFixes */ false);
}
/**
* Whitebox test for {@link FixWindow} and its queue: add a few fixes to the queue, then add a few significantly
* newer fixes to the queue that cause the older fixes to get added to the {@link FixWindow} one after the other.
* Then, add a fix immediately before the last that causes a direction change that exceeds the threshold and thus
* produces a maneuver candidate letting only the newest fix in FixWindow. Then, add another fix to the queue,
* causing the queue's oldest fix to get moved to the {@link FixWindow}, unless when trimming the
* {@link FixWindow} the queue would have been trimmed with it. If not, a {@link NoSuchElementException}
* would be thrown.
*/
@Test
public void testForcingFixOlderThanFixWindowIntoQueue() {
final GPSFixMoving fix1 = fix(10000l, 49, 8, 5, 4);
final double lastCOG = 30;
final GPSFixMoving fix2 = travel(fix1, 4000l, 5, lastCOG);
final GPSFixMoving fix3 = travel(fix2, 4000l, 5, lastCOG);
track.add(fix1);
track.add(fix2);
track.add(fix3);
// now add five newer fixes, forcing the five older fixes to advance into the FixWindow:
final GPSFixMoving fix6 = travel(fix1, track.getMillisecondsOverWhichToAverageSpeed()+1, 5, lastCOG);
final GPSFixMoving fix7 = travel(fix6, 4000l, 5, lastCOG);
final GPSFixMoving fix8 = travel(fix7, 4000l, 5, lastCOG);
track.add(fix6);
track.add(fix7);
track.add(fix8);
// we expect no maneuver to have been recognized yet
Iterable<GPSFixMoving> candidates = approximation.approximate(fix1.getTimePoint(), fix2.getTimePoint());
assertTrue(Util.isEmpty(candidates));
// now add a fix that, when added to FixWindow, will trigger a maneuver candidate emission
// because COG 0deg to COG 16deg is more than the 15deg threshold
// FIXME bug6222: the fix recognized as "maneuver fix" (the one with the greatest course change) must be after the early fix that remains in the queue!
// FIXME bug6222: This is only possible if the greatest change is not at the fix added late from the queue but from a later FixWindow fix
final GPSFixMoving fix1_5 = travel(fix1, 500l, 5, 8);
track.add(fix1_5);
// now add a fix to the queue that is later than the FixWindow's start (assumed to be at fix1)
// and before the FixWindow's end (assumed to be fix5 at the moment); the fix won't be added until
// a fix that is at least track.getMillisecondsOverWhichToAverageSpeed() newer is added to the queue:
final GPSFixMoving fix1_75 = travel(fix1_5, 250l, 5, 9);
track.add(fix1_75);
// force fix4_5 to get moved to FixWindow:
final GPSFixMoving fix9 = travel(fix8, 1000l, 5, lastCOG);
track.add(fix9); // expected to trigger moving oldest queued fix2_5 to get added to the FixWindow
// we expect one maneuver candidate to have been recognized now
Iterable<GPSFixMoving> candidates2 = approximation.approximate(fix1.getTimePoint(), fix3.getTimePoint());
assertEquals(1, Util.size(candidates2));
assertEquals(fix2.getTimePoint(), candidates2.iterator().next().getTimePoint());
// and this should have spanned fix1..fix5 with the greatest course change on fix5, so that gets
// emitted as the maneuver candidate, and all fixes from FixWindow's head up to and including fix5
// are expected to get removed from FixWindow
// Now add an ever newer fix to the queue, forcing fix3_5 to get added if it hasn't been cleaned up
// by the FixWindow trimming:
final GPSFixMoving fix10 = travel(fix9, 4000l, 5, 2);
track.add(fix10);
}
@Test
public void simpleTackRecognition() {
final GPSFixMoving start = fix(10000l, 0, 0, 5, 0);
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CourseChangeBasedTrackApproximation.java
+30 -3
View File
@@ -173,7 +173,7 @@ public class CourseChangeBasedTrackApproximation implements Serializable, GPSTra
* <p>
*
* This method queues the new fix and only adds it to the window when it is "old enough" to not be influenced
* anymore by newer fixes that may still arrive. The influence is measured by half the
* anymore by newer fixes that may still arrive. The influence is measured by the
* {@link GPSFixTrack#getMillisecondsOverWhichToAverageSpeed()} interval. This way, approximation results
* are more stable but have a delay with regards to the newest fixes known by the track.<p>
*
@@ -280,6 +280,12 @@ public class CourseChangeBasedTrackApproximation implements Serializable, GPSTra
courseChangeBetweenFixesInWindow.add(new ScalableDouble(courseChangeBetweenPreviousAndNextInDegrees));
} else {
courseChangeBetweenFixesInWindow.add(insertPosition-1, new ScalableDouble(courseChangeBetweenPreviousAndNextInDegrees));
if (courseChangeBetweenFixesInWindow.size() > insertPosition) { // the node just added isn't the last one; update the next node!
courseChangeBetweenFixesInWindow.remove(insertPosition);
final SpeedWithBearing nextNextSpeed = this.speedForFixesInWindow.get(insertPosition+1);
final double courseChangeBetweenNextAndNextNextInDegrees = nextSpeed.getBearing().getDifferenceTo(nextNextSpeed.getBearing()).getDegrees();
courseChangeBetweenFixesInWindow.add(insertPosition, new ScalableDouble(courseChangeBetweenNextAndNextNextInDegrees));
}
}
if (windowDuration.compareTo(getMaximumWindowLength()) > 0) {
result = tryToExtractManeuverCandidate();
@@ -360,15 +366,35 @@ public class CourseChangeBasedTrackApproximation implements Serializable, GPSTra
*/
private void removeFirst(int howManyElementsToRemove) {
assert !window.isEmpty();
final int oldSize = window.size();
for (int i=0; i<howManyElementsToRemove; i++) {
window.removeFirst();
speedForFixesInWindow.removeFirst();
}
trimQueue();
windowDuration = window.isEmpty() ? Duration.NULL : window.getFirst().getTimePoint().until(window.getLast().getTimePoint());
// adjust totalCourseChangeFromBeginningOfWindow by subtracting the first course change from all others
// and shifting all by one position to the "left"
if (!courseChangeBetweenFixesInWindow.isEmpty()) {
courseChangeBetweenFixesInWindow.removeFirst(howManyElementsToRemove);
// when removing the last element from the window, we have no "between fixes" anymore;
// courseChangeBetweenFixesInWindow contains one element fewer than window, unless window is
// empty in which case courseChangeBetweenFixesInWindow is also empty.
courseChangeBetweenFixesInWindow.removeFirst(howManyElementsToRemove==oldSize?
howManyElementsToRemove-1:howManyElementsToRemove);
}
}
/**
* After having {@link #removeFirst(int) removed} items from the {@link #window}, the {@link #queueOfNewFixes}
* may now contain fixes older than the oldest element in {@link #window}. This would violate our assumption that
* only fixes at or after the start of the window are added, so we need to "trim" the queue accordingly.
*/
private void trimQueue() {
if (!window.isEmpty()) {
final TimePoint timePointOfOldestFixInWindow = window.getFirst().getTimePoint();
while (!queueOfNewFixes.isEmpty() && queueOfNewFixes.peekFirst().getTimePoint().before(timePointOfOldestFixInWindow)) {
queueOfNewFixes.removeFirst();
}
}
}
@@ -406,7 +432,7 @@ public class CourseChangeBasedTrackApproximation implements Serializable, GPSTra
final double absoluteCourseChangeInDegrees = courseChange.divide(maximumCourseChangeToStarboard >= maximumCourseChangeToPort ? 1 : -1);
if (absoluteCourseChangeInDegrees > maximumAbsoluteCourseChangeInCorrectDirection) {
maximumAbsoluteCourseChangeInCorrectDirection = absoluteCourseChangeInDegrees;
indexOfMaximumAbsoluteCourseChangeInCorrectDirection = i;
indexOfMaximumAbsoluteCourseChangeInCorrectDirection = i+1; // the course change is to the next fix in window
}
i++;
}
@@ -414,6 +440,7 @@ public class CourseChangeBasedTrackApproximation implements Serializable, GPSTra
} else {
result = null;
}
assert indexOfMaximumAbsoluteCourseChangeInCorrectDirection < window.size();
return result == null ? null : new Pair<>(result, indexOfMaximumAbsoluteCourseChangeInCorrectDirection);
}
java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
+4 -4
View File
@@ -282,28 +282,28 @@
id="org.eclipse.jetty.apache-jsp"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.apache-jsp.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.osgi.boot.jsp"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.osgi.boot.jsp.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
java/com.sap.sailing.targetplatform.base/plugins/target-base/apache-jsp-9.4.57.v20241219.jar
BIN
View File
Binary file not shown.
java/com.sap.sailing.targetplatform.base/plugins/target-base/apache-jsp-9.4.57.v20241219-sources.jar → java/com.sap.sailing.targetplatform.base/plugins/target-base/apache-jsp-9.4.58.v20250814-sources.jar
BIN
View File
Binary file not shown.
java/com.sap.sailing.targetplatform.base/plugins/target-base/apache-jsp-9.4.58.v20250814.jar
BIN
View File
Binary file not shown.
java/com.sap.sailing.targetplatform.base/plugins/target-base/jetty-osgi-boot-jsp-9.4.57.v20241219.jar
BIN
View File
Binary file not shown.
java/com.sap.sailing.targetplatform.base/plugins/target-base/jetty-osgi-boot-jsp-9.4.57.v20241219-sources.jar → java/com.sap.sailing.targetplatform.base/plugins/target-base/jetty-osgi-boot-jsp-9.4.58.v20250814-sources.jar
BIN
View File
Binary file not shown.
java/com.sap.sailing.targetplatform.base/plugins/target-base/jetty-osgi-boot-jsp-9.4.58.v20250814.jar
BIN
View File
Binary file not shown.
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
+3 -3
View File
@@ -87,9 +87,9 @@
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.bundles.f.feature.group" version="9.4.57.v20241219"/>
<unit id="org.eclipse.jetty.bundles.f.source.feature.group" version="9.4.57.v20241219"/>
<repository location="https://p2.sapsailing.com/p2/jetty-9.4.57.v20241219/"/>
<unit id="org.eclipse.jetty.bundles.f.feature.group" version="9.4.58.v20250814"/>
<unit id="org.eclipse.jetty.bundles.f.source.feature.group" version="9.4.58.v20250814"/>
<repository location="https://p2.sapsailing.com/p2/jetty-9.4.58.v20250814"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.apache.felix.gogo.command" version="1.1.0.v20201023-1558"/>
java/com.sap.sailing.targetplatform/scripts/createAndUploadJettyP2Repository.sh
+2
View File
@@ -1,4 +1,6 @@
#!/bin/bash
# Fetches the latest Jetty 9.4 version from the official Jetty p2 repository, uploads it to sapsailing.com and updates all references in the workspace.
# Specific components such as apache-jsp and jetty-osgi-boot-jsp are updated to the new version, too, but not from the p2 repo but directly from Maven Central, as the p2 repo does not contain the source bundles.
VERSION=$( curl https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/ | grep "/jetty/updates/jetty-bundles-9.x" | sed -e 's/^.*> \?\(9\.4\.[0-9]*\.v[0-9]*\)<.*$/\1/' )
echo "Found version ${VERSION}"
P2_URL="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/${VERSION}/"
java/com.sap.sse.feature.runtime/feature.xml
+42 -42
View File
@@ -63,14 +63,14 @@
id="org.eclipse.jetty.osgi.boot"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.osgi.boot.warurl"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
@@ -119,224 +119,224 @@
id="org.eclipse.jetty.deploy"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.deploy.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.http"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.http.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.io"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.io.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.jmx"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.jmx.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.security"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.security.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.server"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.server.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.servlet"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.servlet.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.util"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.util.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.util.ajax"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.util.ajax.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.webapp"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.webapp.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.api"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.api.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.client"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.client.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.common"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.common.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.server"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.server.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.servlet"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.servlet.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.xml"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.xml.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
@@ -545,7 +545,7 @@
id="org.eclipse.jetty.client"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
@@ -873,21 +873,21 @@
id="org.eclipse.jetty.apache-jsp"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.apache-jsp.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.osgi.boot.jsp"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
fragment="true"
unpack="false"/>
@@ -895,7 +895,7 @@
id="org.eclipse.jetty.osgi.boot.jsp.source"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
@@ -1007,21 +1007,21 @@
id="org.eclipse.jetty.annotations"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.jndi"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin
id="org.eclipse.jetty.plus"
download-size="0"
install-size="0"
version="9.4.57.v20241219"
version="9.4.58.v20250814"
unpack="false"/>
<plugin