eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-03 17:49:40 +00:00
Code Activity

consolidated all Util stuff in com.sap.sse.common.Util now

Browse Source
This commit is contained in:
Axel Uhl committed 2014-06-03 00:01:14 +02:00
1 parent cb9354b1a0
commit 53a0b36e8e
249 files changed
+1646 -1651
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/LeaderboardDTODiffingTest.java
+3 -3
View File
@@ -144,18 +144,18 @@ public class LeaderboardDTODiffingTest {
}
newVersion.rows = newRows;
Map<CompetitorDTO, LeaderboardRowDTO> rowsBeforeStripping = newVersion.rows;
Map<com.sap.sse.common.UtilNew.Pair<CompetitorDTO, String>, List<LegEntryDTO>> previousLegDetailsBeforeStripping = new HashMap<>();
Map<com.sap.sse.common.Util.Pair<CompetitorDTO, String>, List<LegEntryDTO>> previousLegDetailsBeforeStripping = new HashMap<>();
for (Map.Entry<CompetitorDTO, LeaderboardRowDTO> e : rowsBeforeStripping.entrySet()) {
for (Map.Entry<String, LeaderboardEntryDTO> e2 : e.getValue().fieldsByRaceColumnName.entrySet()) {
if (e2.getValue().legDetails != null) {
previousLegDetailsBeforeStripping.put(new com.sap.sse.common.UtilNew.Pair<CompetitorDTO, String>(e.getKey(), e2.getKey()),
previousLegDetailsBeforeStripping.put(new com.sap.sse.common.Util.Pair<CompetitorDTO, String>(e.getKey(), e2.getKey()),
new ArrayList<>(e2.getValue().legDetails));
}
}
}
newVersion.strip(previousVersion);
// see bug 1455; check that the stripping doesn't kill the previous leaderboard's legDetails lists
for (Map.Entry<com.sap.sse.common.UtilNew.Pair<CompetitorDTO, String>, List<LegEntryDTO>> e : previousLegDetailsBeforeStripping.entrySet()) {
for (Map.Entry<com.sap.sse.common.Util.Pair<CompetitorDTO, String>, List<LegEntryDTO>> e : previousLegDetailsBeforeStripping.entrySet()) {
final LeaderboardRowDTO leaderboardRowDTO = rowsBeforeStripping.get(e.getKey().getA());
if (leaderboardRowDTO != null) {
List<LegEntryDTO> newLegDetails = leaderboardRowDTO.fieldsByRaceColumnName.get(e.getKey().getB()).legDetails;
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
+4 -4
View File
@@ -28,7 +28,7 @@ import com.sap.sailing.domain.tractracadapter.Receiver;
import com.sap.sailing.domain.tractracadapter.TracTracConnectionConstants;
import com.sap.sailing.domain.tractracadapter.TracTracControlPoint;
import com.sap.sailing.domain.tractracadapter.impl.ControlPointAdapter;
import com.sap.sse.common.UtilNew;
import com.sap.sse.common.Util;
import com.tractrac.clientmodule.ControlPoint;
import com.tractrac.clientmodule.Event;
import com.tractrac.clientmodule.data.DataController;
@@ -205,10 +205,10 @@ public abstract class AbstractTracTracLiveTest extends StoredTrackBasedTest impl
System.err.println("Error with live data "+arg0);
}
public static Iterable<UtilNew.Pair<TracTracControlPoint, PassingInstruction>> getTracTracControlPointsWithPassingInstructions(Iterable<ControlPoint> controlPoints) {
List<UtilNew.Pair<TracTracControlPoint, PassingInstruction>> ttControlPoints = new ArrayList<UtilNew.Pair<TracTracControlPoint, PassingInstruction>>();
public static Iterable<Util.Pair<TracTracControlPoint, PassingInstruction>> getTracTracControlPointsWithPassingInstructions(Iterable<ControlPoint> controlPoints) {
List<Util.Pair<TracTracControlPoint, PassingInstruction>> ttControlPoints = new ArrayList<Util.Pair<TracTracControlPoint, PassingInstruction>>();
for (com.tractrac.clientmodule.ControlPoint cp : controlPoints) {
ttControlPoints.add(new UtilNew.Pair<TracTracControlPoint, PassingInstruction>(new ControlPointAdapter(cp), null));
ttControlPoints.add(new Util.Pair<TracTracControlPoint, PassingInstruction>(new ControlPointAdapter(cp), null));
}
return ttControlPoints;
}
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseTest.java
+4 -4
View File
@@ -179,10 +179,10 @@ public class CourseTest {
assertEquals(3, Util.size(course.getWaypoints()));
assertEquals(2, Util.size(course.getLegs()));
assertWaypointIndexes(course);
List<com.sap.sse.common.UtilNew.Pair<ControlPoint, PassingInstruction>> courseToUpdate = new ArrayList<com.sap.sse.common.UtilNew.Pair<ControlPoint, PassingInstruction>>();
courseToUpdate.add(new com.sap.sse.common.UtilNew.Pair<ControlPoint, PassingInstruction>(wp2.getMarks().iterator().next(), wp2.getPassingInstructions()));
courseToUpdate.add(new com.sap.sse.common.UtilNew.Pair<ControlPoint, PassingInstruction>(wp3.getMarks().iterator().next(), wp3.getPassingInstructions()));
courseToUpdate.add(new com.sap.sse.common.UtilNew.Pair<ControlPoint, PassingInstruction>(wp1.getMarks().iterator().next(), wp1.getPassingInstructions()));
List<com.sap.sse.common.Util.Pair<ControlPoint, PassingInstruction>> courseToUpdate = new ArrayList<com.sap.sse.common.Util.Pair<ControlPoint, PassingInstruction>>();
courseToUpdate.add(new com.sap.sse.common.Util.Pair<ControlPoint, PassingInstruction>(wp2.getMarks().iterator().next(), wp2.getPassingInstructions()));
courseToUpdate.add(new com.sap.sse.common.Util.Pair<ControlPoint, PassingInstruction>(wp3.getMarks().iterator().next(), wp3.getPassingInstructions()));
courseToUpdate.add(new com.sap.sse.common.Util.Pair<ControlPoint, PassingInstruction>(wp1.getMarks().iterator().next(), wp1.getPassingInstructions()));
course.update(courseToUpdate, DomainFactory.INSTANCE);
assertWaypointIndexes(course);
}
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class CourseUpdateTest extends AbstractTracTracLiveTest {
}, /* delayToLiveInMillis */ 0l,
/* millisecondsOverWhichToAverageWind */ 30000, /* simulator */ null, /*courseDesignUpdateURI*/ null, /*tracTracUsername*/ null, /*tracTracPassword*/ null) {
@Override
protected void handleEvent(com.sap.sse.common.UtilNew.Triple<Route, RouteData, Race> event) {
protected void handleEvent(com.sap.sse.common.Util.Triple<Route, RouteData, Race> event) {
super.handleEvent(event);
synchronized (routeData) {
routeData[0] = event.getB();
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardForKielWeekTest.java
+4 -4
View File
@@ -27,7 +27,7 @@ import com.sap.sailing.domain.leaderboard.impl.LowPoint;
import com.sap.sailing.domain.leaderboard.impl.ThresholdBasedResultDiscardingRuleImpl;
import com.sap.sailing.domain.tracking.impl.WindImpl;
import com.sap.sailing.domain.tractracadapter.ReceiverType;
import com.sap.sse.common.UtilNew;
import com.sap.sse.common.Util;
public class LeaderboardForKielWeekTest extends OnlineTracTracBasedTest {
@@ -48,19 +48,19 @@ public class LeaderboardForKielWeekTest extends OnlineTracTracBasedTest {
Competitor kevin = getCompetitorByName("Kevin");
RaceColumn column = leaderboard.addRace(getTrackedRace(), "Test Race 1", /* medalRace */ false, defaultFleet);
assertEquals(17, leaderboard.getTotalPoints(kevin, now), 0.000000001);
UtilNew.Pair<Competitor, RaceColumn> key = new UtilNew.Pair<Competitor, RaceColumn>(kevin, column);
Util.Pair<Competitor, RaceColumn> key = new Util.Pair<Competitor, RaceColumn>(kevin, column);
assertEquals(17, leaderboard.getContent(now).get(key).getTotalPoints(), 0.000000001);
assertEquals(17, leaderboard.getEntry(kevin, column, now).getTotalPoints(), 0.000000001);
loadRace("event_20110609_KielerWoch-505_Race_3.txt", "event_20110609_KielerWoch-505_Race_3.mtb"); // 505 Race 3
column = leaderboard.addRace(getTrackedRace(), "Test Race 2", /* medalRace */ false, defaultFleet);
key = new UtilNew.Pair<Competitor, RaceColumn>(kevin, column);
key = new Util.Pair<Competitor, RaceColumn>(kevin, column);
// In Race 3, Hasso ranked 31st
assertEquals(29, leaderboard.getTotalPoints(kevin, now), 0.000000001);
assertEquals(12, leaderboard.getContent(now).get(key).getTotalPoints(), 0.000000001);
assertEquals(12, leaderboard.getEntry(kevin, column, now).getTotalPoints(), 0.000000001);
loadRace("event_20110609_KielerWoch-505_race_4.txt", "event_20110609_KielerWoch-505_race_4.mtb"); // 505 Race 4
column = leaderboard.addRace(getTrackedRace(), "Test Race 3", /* medalRace */ false, defaultFleet);
key = new UtilNew.Pair<Competitor, RaceColumn>(kevin, column);
key = new Util.Pair<Competitor, RaceColumn>(kevin, column);
// now the first race is discarded because Kevin ranked worst compared to the other two; in race 4 he ranked 10th
assertEquals(22, leaderboard.getTotalPoints(kevin, now), 0.000000001);
assertEquals(10, leaderboard.getContent(now).get(key).getTotalPoints(), 0.000000001);
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardOfflineTest.java
+1 -1
View File
@@ -322,7 +322,7 @@ public class LeaderboardOfflineTest extends AbstractLeaderboardTest {
int medalRacePoints = getMedalRacePoints(competitor, now, defaultFleet);
for (TrackedRace race : testRaces) {
RaceColumn raceColumn = raceColumnsInLeaderboard.get(race);
com.sap.sse.common.UtilNew.Pair<Competitor, RaceColumn> key = new com.sap.sse.common.UtilNew.Pair<Competitor, RaceColumn>(competitor, raceColumn);
com.sap.sse.common.Util.Pair<Competitor, RaceColumn> key = new com.sap.sse.common.Util.Pair<Competitor, RaceColumn>(competitor, raceColumn);
if (race.hasStarted(now)) {
int rank = race.getRank(competitor, now);
assertEquals(rank, leaderboard.getTrackedRank(competitor, raceColumn, now));
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OfflineSerializationTest.java
+8 -8
View File
@@ -52,16 +52,16 @@ public class OfflineSerializationTest extends AbstractSerializationTest {
DomainFactory receiverDomainFactory = new DomainFactoryImpl();
final Throwable s1 = new Throwable();
final Throwable s2 = new Throwable();
com.sap.sse.common.UtilNew.Pair<Throwable, Throwable> p =
new com.sap.sse.common.UtilNew.Pair<Throwable, Throwable>(
com.sap.sse.common.Util.Pair<Throwable, Throwable> p =
new com.sap.sse.common.Util.Pair<Throwable, Throwable>(
s1, s2);
HashSet<com.sap.sse.common.UtilNew.Pair<Throwable, Throwable>> s =
new HashSet<com.sap.sse.common.UtilNew.Pair<Throwable, Throwable>>();
HashSet<com.sap.sse.common.Util.Pair<Throwable, Throwable>> s =
new HashSet<com.sap.sse.common.Util.Pair<Throwable, Throwable>>();
s.add(p);
Set<com.sap.sse.common.UtilNew.Pair<Throwable, Throwable>> ss =
Set<com.sap.sse.common.Util.Pair<Throwable, Throwable>> ss =
cloneBySerialization(s, /* resolveAgainst */ receiverDomainFactory);
com.sap.sse.common.UtilNew.Pair<Throwable, Throwable> ps = ss.iterator().next();
com.sap.sse.common.Util.Pair<Throwable, Throwable> ps = ss.iterator().next();
Throwable s1Des = ps.getA();
Throwable s2Des = ps.getB();
assertNotSame(s, ss);
@@ -69,8 +69,8 @@ public class OfflineSerializationTest extends AbstractSerializationTest {
assertNotSame(s1, s1Des);
assertNotSame(s2, s2Des);
assertEquals(1, ss.size());
com.sap.sse.common.UtilNew.Pair<Throwable, Throwable> pNew =
new com.sap.sse.common.UtilNew.Pair<Throwable, Throwable>(s1Des, s2Des);
com.sap.sse.common.Util.Pair<Throwable, Throwable> pNew =
new com.sap.sse.common.Util.Pair<Throwable, Throwable>(s1Des, s2Des);
assertEquals(ps.hashCode(), pNew.hashCode());
assertTrue(ss.contains(pNew));
}
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PolarSheetGenerationTest.java
+4 -4
View File
@@ -221,14 +221,14 @@ public class PolarSheetGenerationTest {
}
@Override
public WindWithConfidence<com.sap.sse.common.UtilNew.Pair<Position, TimePoint>> getWindWithConfidence(Position p, TimePoint at) {
return new WindWithConfidenceImpl<com.sap.sse.common.UtilNew.Pair<Position, TimePoint>>(new WindImpl(p, at,
public WindWithConfidence<com.sap.sse.common.Util.Pair<Position, TimePoint>> getWindWithConfidence(Position p, TimePoint at) {
return new WindWithConfidenceImpl<com.sap.sse.common.Util.Pair<Position, TimePoint>>(new WindImpl(p, at,
new KnotSpeedWithBearingImpl(2.0, new DegreeBearingImpl(180.0))), 0.9,
new com.sap.sse.common.UtilNew.Pair<Position, TimePoint>(p, at), true);
new com.sap.sse.common.Util.Pair<Position, TimePoint>(p, at), true);
}
@Override
public WindWithConfidence<com.sap.sse.common.UtilNew.Pair<Position, TimePoint>> getWindWithConfidence(Position p, TimePoint at,
public WindWithConfidence<com.sap.sse.common.Util.Pair<Position, TimePoint>> getWindWithConfidence(Position p, TimePoint at,
Iterable<WindSource> windSourcesToExclude) {
return getWindWithConfidence(p, at);
}
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializationWithOnlineRaceTest.java
+3 -3
View File
@@ -50,11 +50,11 @@ public class SerializationWithOnlineRaceTest extends OnlineTracTracBasedTest {
new DegreeBearingImpl(65))), new WindSourceImpl(WindSourceType.WEB));
}
private com.sap.sse.common.UtilNew.Pair<Integer, Long> getSerializationSizeAndTime(Serializable s) throws IOException {
private com.sap.sse.common.Util.Pair<Integer, Long> getSerializationSizeAndTime(Serializable s) throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
long start = System.currentTimeMillis();
new ObjectOutputStream(bos).writeObject(s);
return new com.sap.sse.common.UtilNew.Pair<Integer, Long>(bos.size(), System.currentTimeMillis()-start);
return new com.sap.sse.common.Util.Pair<Integer, Long>(bos.size(), System.currentTimeMillis()-start);
}
@Test
@@ -66,7 +66,7 @@ public class SerializationWithOnlineRaceTest extends OnlineTracTracBasedTest {
cloneOfFindelsTrack.lockForRead();
try {
assertEquals(Util.size(findelsTrack.getFixes()), Util.size(cloneOfFindelsTrack.getFixes()));
com.sap.sse.common.UtilNew.Pair<Integer, Long> sizeAndTime = getSerializationSizeAndTime(findelsTrack);
com.sap.sse.common.Util.Pair<Integer, Long> sizeAndTime = getSerializationSizeAndTime(findelsTrack);
System.out.println(sizeAndTime);
assertTrue(sizeAndTime.getA() > 100000);
} finally {
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java
+11 -11
View File
@@ -260,12 +260,12 @@ public class TrackTest {
*/
@Test
public void testDistanceTraveledBackwardsQuery() {
final Set<com.sap.sse.common.UtilNew.Triple<TimePoint, TimePoint, Distance>> cacheEntries = new HashSet<>();
final Set<com.sap.sse.common.Util.Triple<TimePoint, TimePoint, Distance>> cacheEntries = new HashSet<>();
final DistanceCache distanceCache = new DistanceCache("test-DistanceCache") {
@Override
public void cache(TimePoint from, TimePoint to, Distance distance) {
super.cache(from, to, distance);
cacheEntries.add(new com.sap.sse.common.UtilNew.Triple<>(from, to, distance));
cacheEntries.add(new com.sap.sse.common.Util.Triple<>(from, to, distance));
}
};
@@ -630,7 +630,7 @@ public class TrackTest {
}
invalidationCalls.clear();
assertEquals(speed.getMetersPerSecond()*(steps-1), track.getDistanceTraveled(now, start).getMeters(), 0.01);
final com.sap.sse.common.UtilNew.Pair<TimePoint, com.sap.sse.common.UtilNew.Pair<TimePoint, Distance>> fullIntervalCacheEntry = distanceCache.getEarliestFromAndDistanceAtOrAfterFrom(now, start);
final com.sap.sse.common.Util.Pair<TimePoint, com.sap.sse.common.Util.Pair<TimePoint, Distance>> fullIntervalCacheEntry = distanceCache.getEarliestFromAndDistanceAtOrAfterFrom(now, start);
assertNotNull(fullIntervalCacheEntry); // no more entry for "to"-value start in cache
assertEquals(start, fullIntervalCacheEntry.getA());
assertEquals(now, fullIntervalCacheEntry.getB().getA());
@@ -646,7 +646,7 @@ public class TrackTest {
final TimePoint timePointOfLastOriginalFix = track.getLastRawFix().getTimePoint();
assertEquals(speed.getMetersPerSecond() * (steps - 1),
track.getDistanceTraveled(now, timePointOfLastOriginalFix).getMeters(), 0.01);
final com.sap.sse.common.UtilNew.Pair<TimePoint, com.sap.sse.common.UtilNew.Pair<TimePoint, Distance>> newFullIntervalCacheEntry = distanceCache
final com.sap.sse.common.Util.Pair<TimePoint, com.sap.sse.common.Util.Pair<TimePoint, Distance>> newFullIntervalCacheEntry = distanceCache
.getEarliestFromAndDistanceAtOrAfterFrom(now, timePointOfLastOriginalFix);
assertNotNull(newFullIntervalCacheEntry); // no more entry for "to"-value start in cache
assertEquals(timePointOfLastOriginalFix, newFullIntervalCacheEntry.getA());
@@ -663,7 +663,7 @@ public class TrackTest {
assertTrue(invalidationCalls.iterator().next().equals(timePointOfLastRawFixBeforeLateOutlier));
invalidationCalls.clear();
// expect the invalidation to have started after the single cache entry, so the cache entry still has to be there:
final com.sap.sse.common.UtilNew.Pair<TimePoint, com.sap.sse.common.UtilNew.Pair<TimePoint, Distance>> stillPresentFullIntervalCacheEntry = distanceCache
final com.sap.sse.common.Util.Pair<TimePoint, com.sap.sse.common.Util.Pair<TimePoint, Distance>> stillPresentFullIntervalCacheEntry = distanceCache
.getEarliestFromAndDistanceAtOrAfterFrom(now, timePointOfLastOriginalFix);
assertNull(stillPresentFullIntervalCacheEntry); // no more entry for "to"-value start in cache because new temporary outlier lies in previously cached interval
GPSFix polishedLastFix = track.getLastFixBefore(new MillisecondsTimePoint(Long.MAX_VALUE)); // get the last smoothened fix...
@@ -688,7 +688,7 @@ public class TrackTest {
assertEquals(track.getLastFixBefore(timePointOfLastRawFixBeforeLateOutlier).getTimePoint().plus(1), invalidationCalls.iterator().next());
assertTrue(timePointForLateOutlier.compareTo(fix.getTimePoint()) < 0);
// expect the invalidation to have started at the fix before the outlier, leaving the previous result ending at the fix right before the outlier intact
final com.sap.sse.common.UtilNew.Pair<TimePoint, com.sap.sse.common.UtilNew.Pair<TimePoint, Distance>> stillStillPresentFullIntervalCacheEntry = distanceCache
final com.sap.sse.common.Util.Pair<TimePoint, com.sap.sse.common.Util.Pair<TimePoint, Distance>> stillStillPresentFullIntervalCacheEntry = distanceCache
.getEarliestFromAndDistanceAtOrAfterFrom(now, timePointOfLastOriginalFix);
assertNull(stillStillPresentFullIntervalCacheEntry); // still nothing in the cache
track.lockForRead();
@@ -794,11 +794,11 @@ public class TrackTest {
assertEquals(speed.getMetersPerSecond()*(steps-1), track.getDistanceTraveled(now, start).getMeters(), 0.01);
assertTrue(invalidationCalls.isEmpty());
// expect a cache entry exactly for the strip's boundaries
com.sap.sse.common.UtilNew.Pair<TimePoint, com.sap.sse.common.UtilNew.Pair<TimePoint, Distance>> stripCacheEntry = distanceCache.getEarliestFromAndDistanceAtOrAfterFrom(stripFrom, stripTo);
com.sap.sse.common.Util.Pair<TimePoint, com.sap.sse.common.Util.Pair<TimePoint, Distance>> stripCacheEntry = distanceCache.getEarliestFromAndDistanceAtOrAfterFrom(stripFrom, stripTo);
assertEquals(stripTo, stripCacheEntry.getA());
assertEquals(stripFrom, stripCacheEntry.getB().getA());
// expect a cache entry exactly for the full boundaries
com.sap.sse.common.UtilNew.Pair<TimePoint, com.sap.sse.common.UtilNew.Pair<TimePoint, Distance>> fullCacheEntry = distanceCache.getEarliestFromAndDistanceAtOrAfterFrom(now, start);
com.sap.sse.common.Util.Pair<TimePoint, com.sap.sse.common.Util.Pair<TimePoint, Distance>> fullCacheEntry = distanceCache.getEarliestFromAndDistanceAtOrAfterFrom(now, start);
assertEquals(start, fullCacheEntry.getA());
assertEquals(now, fullCacheEntry.getB().getA());
}
@@ -928,7 +928,7 @@ public class TrackTest {
speed.travel(firstFixSoFar.getTimePoint(), firstFixSoFar.getTimePoint().plus(timespan)));
GPSFixMoving newFirstFix = new GPSFixMovingImpl(newPosition, slightlyBeforeFirstFix, speed);
track.addGPSFix(newFirstFix);
com.sap.sse.common.UtilNew.Pair<TimePoint, TimePoint> intervalAffected = track.getEstimatedPositionTimePeriodAffectedBy(newFirstFix);
com.sap.sse.common.Util.Pair<TimePoint, TimePoint> intervalAffected = track.getEstimatedPositionTimePeriodAffectedBy(newFirstFix);
Position newPositionAtBeginningOfTime = track.getEstimatedPosition(beginningOfTime, /* extrapolate */false);
assertFalse(newPositionAtBeginningOfTime.equals(positionAtBeginningOfTime));
assertTrue(!intervalAffected.getA().after(beginningOfTime));
@@ -947,7 +947,7 @@ public class TrackTest {
speed.travel(lastFixSoFar.getTimePoint(), lastFixSoFar.getTimePoint().plus(timespan)));
GPSFixMoving newLastFix = new GPSFixMovingImpl(newPosition, slightlyAfterLastFix, speed);
track.addGPSFix(newLastFix);
com.sap.sse.common.UtilNew.Pair<TimePoint, TimePoint> intervalAffected = track.getEstimatedPositionTimePeriodAffectedBy(newLastFix);
com.sap.sse.common.Util.Pair<TimePoint, TimePoint> intervalAffected = track.getEstimatedPositionTimePeriodAffectedBy(newLastFix);
Position newPositionAtEndOfTime = track.getEstimatedPosition(endOfTime, /* extrapolate */false);
assertFalse(newPositionAtEndOfTime.equals(positionAtEndOfTime));
assertTrue(!intervalAffected.getB().before(endOfTime));
@@ -965,7 +965,7 @@ public class TrackTest {
assertNull(positionAtEndOfTime);
GPSFixMoving newFix = new GPSFixMovingImpl(new DegreePosition(12, 34), now, new KnotSpeedWithBearingImpl(12, new DegreeBearingImpl(123)));
myTrack.addGPSFix(newFix);
com.sap.sse.common.UtilNew.Pair<TimePoint, TimePoint> intervalAffected = myTrack.getEstimatedPositionTimePeriodAffectedBy(newFix);
com.sap.sse.common.Util.Pair<TimePoint, TimePoint> intervalAffected = myTrack.getEstimatedPositionTimePeriodAffectedBy(newFix);
Position newPositionAtBeginningOfTime = myTrack.getEstimatedPosition(beginningOfTime, /* extrapolate */false);
Position newPositionAtEndOfTime = myTrack.getEstimatedPosition(now, /* extrapolate */false);
assertFalse(newPositionAtBeginningOfTime.equals(positionAtBeginningOfTime));
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java
+3 -3
View File
@@ -44,7 +44,7 @@ import com.sap.sailing.domain.tracking.impl.GPSFixMovingImpl;
import com.sap.sailing.domain.tracking.impl.MarkPassingImpl;
import com.sap.sailing.domain.tracking.impl.TrackBasedEstimationWindTrackImpl;
import com.sap.sailing.domain.tracking.impl.WindImpl;
import com.sap.sse.common.UtilNew;
import com.sap.sse.common.Util;
public class WindEstimationOnConstructedTracksTest extends StoredTrackBasedTest {
private List<Competitor> competitors;
@@ -116,14 +116,14 @@ public class WindEstimationOnConstructedTracksTest extends StoredTrackBasedTest
// produces estimated bearing of 170deg; result should be averaged between 170 (estimation) and 180 (web) deg
setBearingForCompetitor(competitors.get(0), now, 305);
setBearingForCompetitor(competitors.get(1), now, 35);
WindWithConfidence<UtilNew.Pair<Position, TimePoint>> combinedWindDirectionMinClusterSizeOne = getTrackedRace()
WindWithConfidence<Util.Pair<Position, TimePoint>> combinedWindDirectionMinClusterSizeOne = getTrackedRace()
.getWindWithConfidence(/* position */null, now);
final double combinedDegreesMinClusterSizeOne = combinedWindDirectionMinClusterSizeOne.getObject().getBearing().getDegrees();
assertTrue(combinedDegreesMinClusterSizeOne > 170 && combinedDegreesMinClusterSizeOne < 180);
// now produce a minimum cluster size of 2, raising the estimation's confidence
setBearingForCompetitor(competitors.get(2), now, 305);
setBearingForCompetitor(competitors.get(3), now, 35);
WindWithConfidence<UtilNew.Pair<Position, TimePoint>> combinedWindDirectionMinClusterSizeTwo = getTrackedRace()
WindWithConfidence<Util.Pair<Position, TimePoint>> combinedWindDirectionMinClusterSizeTwo = getTrackedRace()
.getWindWithConfidence(/* position */null, now);
final double combinedDegreesNow = combinedWindDirectionMinClusterSizeTwo.getObject().getBearing().getDegrees();
assertTrue(combinedDegreesNow > 170 && combinedDegreesNow < 180);
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java
+2 -2
View File
@@ -39,7 +39,7 @@ import com.sap.sailing.domain.tracking.GPSFixMoving;
import com.sap.sailing.domain.tracking.MarkPassing;
import com.sap.sailing.domain.tracking.impl.WindImpl;
import com.sap.sailing.domain.tractracadapter.ReceiverType;
import com.sap.sse.common.UtilNew;
import com.sap.sse.common.Util;
public abstract class AbstractMarkPassingTest extends OnlineTracTracBasedTest {
@@ -217,7 +217,7 @@ public abstract class AbstractMarkPassingTest extends OnlineTracTracBasedTest {
} finally {
getTrackedRace().getTrack(c).unlockAfterRead();
}
UtilNew.Pair<Iterable<Candidate>, Iterable<Candidate>> f = finder.getCandidateDeltas(c, fixes);
Util.Pair<Iterable<Candidate>, Iterable<Candidate>> f = finder.getCandidateDeltas(c, fixes);
chooser.calculateMarkPassDeltas(c, f);
boolean gotPassed = true;
boolean gotOther = false;
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
+4 -4
View File
@@ -42,7 +42,7 @@ import com.sap.sailing.domain.tracking.impl.EmptyWindStore;
import com.sap.sailing.domain.tracking.impl.GPSFixImpl;
import com.sap.sailing.domain.tracking.impl.GPSFixMovingImpl;
import com.sap.sailing.domain.tracking.impl.TrackedRegattaImpl;
import com.sap.sse.common.UtilNew;
import com.sap.sse.common.Util;
public class AbstractMockedRaceMarkPassingTest {
protected Competitor bob = new CompetitorImpl("Bob", "Bob", null, null, null);
@@ -71,9 +71,9 @@ public class AbstractMockedRaceMarkPassingTest {
trackedRace.setStartTimeReceived(new MillisecondsTimePoint(System.currentTimeMillis() - 120000));
List<MillisecondsTimePoint> tps = Arrays.asList(new MillisecondsTimePoint(System.currentTimeMillis()), new MillisecondsTimePoint(System.currentTimeMillis() - 30000),
new MillisecondsTimePoint(System.currentTimeMillis() + 30000));
List<UtilNew.Pair<Mark, Position>> pos = Arrays.asList(new UtilNew.Pair<Mark, Position>(m, new DegreePosition(0, 0)), new UtilNew.Pair<Mark, Position>(m2, new DegreePosition(-0.001, -0.00005)),
new UtilNew.Pair<Mark, Position>(m3, new DegreePosition(-0.001, 0.00005)));
for (UtilNew.Pair<Mark, Position> pair : pos) {
List<Util.Pair<Mark, Position>> pos = Arrays.asList(new Util.Pair<Mark, Position>(m, new DegreePosition(0, 0)), new Util.Pair<Mark, Position>(m2, new DegreePosition(-0.001, -0.00005)),
new Util.Pair<Mark, Position>(m3, new DegreePosition(-0.001, 0.00005)));
for (Util.Pair<Mark, Position> pair : pos) {
for (TimePoint t : tps) {
trackedRace.recordFix(pair.getA(), new GPSFixImpl(pair.getB(), t));
}
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingCalculatorPerformanceTest.java
+3 -3
View File
@@ -22,7 +22,7 @@ import com.sap.sailing.domain.test.measurements.MeasurementCase;
import com.sap.sailing.domain.test.measurements.MeasurementXMLFile;
import com.sap.sailing.domain.tracking.GPSFix;
import com.sap.sailing.domain.tracking.GPSFixMoving;
import com.sap.sse.common.UtilNew;
import com.sap.sse.common.Util;
public class MarkPassingCalculatorPerformanceTest extends AbstractMockedRaceMarkPassingTest {
@@ -72,7 +72,7 @@ public class MarkPassingCalculatorPerformanceTest extends AbstractMockedRaceMark
}
time = System.currentTimeMillis();
CandidateChooser c = new CandidateChooser(trackedRace);
c.calculateMarkPassDeltas(bob, new UtilNew.Pair<Iterable<Candidate>, Iterable<Candidate>>(newCans, new ArrayList<Candidate>()));
c.calculateMarkPassDeltas(bob, new Util.Pair<Iterable<Candidate>, Iterable<Candidate>>(newCans, new ArrayList<Candidate>()));
time = System.currentTimeMillis() - time;
ArrayList<Long> times = new ArrayList<>();
for (int i = 0; i < 100; i++) {
@@ -82,7 +82,7 @@ public class MarkPassingCalculatorPerformanceTest extends AbstractMockedRaceMark
ne.add(randomCan());
}
time = System.currentTimeMillis();
c.calculateMarkPassDeltas(bob, new UtilNew.Pair<Iterable<Candidate>, Iterable<Candidate>>(ne, old));
c.calculateMarkPassDeltas(bob, new Util.Pair<Iterable<Candidate>, Iterable<Candidate>>(ne, old));
times.add(System.currentTimeMillis() - time);
old = ne;
}
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
+5 -5
View File
@@ -57,7 +57,7 @@ import com.sap.sailing.domain.tracking.WindStore;
import com.sap.sailing.domain.tracking.WindTrack;
import com.sap.sailing.domain.tracking.WindWithConfidence;
import com.sap.sailing.domain.tracking.impl.WindTrackImpl;
import com.sap.sse.common.UtilNew;
import com.sap.sse.common.Util;
public class MockedTrackedRace implements DynamicTrackedRace {
private static final long serialVersionUID = 5827912985564121181L;
@@ -618,7 +618,7 @@ public class MockedTrackedRace implements DynamicTrackedRace {
}
@Override
public WindWithConfidence<UtilNew.Pair<Position, TimePoint>> getWindWithConfidence(Position p, TimePoint at,
public WindWithConfidence<Util.Pair<Position, TimePoint>> getWindWithConfidence(Position p, TimePoint at,
Iterable<WindSource> windSourcesToExclude) {
// TODO Auto-generated method stub
return null;
@@ -631,7 +631,7 @@ public class MockedTrackedRace implements DynamicTrackedRace {
}
@Override
public WindWithConfidence<UtilNew.Pair<Position, TimePoint>> getWindWithConfidence(Position p, TimePoint at) {
public WindWithConfidence<Util.Pair<Position, TimePoint>> getWindWithConfidence(Position p, TimePoint at) {
// TODO Auto-generated method stub
return null;
}
@@ -667,7 +667,7 @@ public class MockedTrackedRace implements DynamicTrackedRace {
}
@Override
public Iterable<UtilNew.Pair<Waypoint, UtilNew.Pair<TimePoint, TimePoint>>> getMarkPassingsTimes() {
public Iterable<Util.Pair<Waypoint, Util.Pair<TimePoint, TimePoint>>> getMarkPassingsTimes() {
// TODO Auto-generated method stub
return null;
}
@@ -945,7 +945,7 @@ public class MockedTrackedRace implements DynamicTrackedRace {
}
@Override
public UtilNew.Pair<Mark, Mark> getPortAndStarboardMarks(TimePoint t, Waypoint w) {
public Util.Pair<Mark, Mark> getPortAndStarboardMarks(TimePoint t, Waypoint w) {
// TODO Auto-generated method stub
return null;
}
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
+4 -4
View File
@@ -44,7 +44,7 @@ import com.sap.sailing.domain.tracking.Wind;
import com.sap.sailing.domain.tracking.WindStore;
import com.sap.sailing.domain.tracking.WindTrack;
import com.sap.sailing.domain.tracking.WindWithConfidence;
import com.sap.sse.common.UtilNew;
import com.sap.sse.common.Util;
/**
* Simple mock for {@link TrackedRace} for leaderboard testing; the leaderboard only requests {@link #hasStarted(TimePoint)} and
@@ -98,7 +98,7 @@ public class MockedTrackedRaceWithStartTimeAndRanks implements TrackedRace {
}
@Override
public Iterable<UtilNew.Pair<Waypoint, UtilNew.Pair<TimePoint, TimePoint>>> getMarkPassingsTimes() {
public Iterable<Util.Pair<Waypoint, Util.Pair<TimePoint, TimePoint>>> getMarkPassingsTimes() {
// TODO Auto-generated method stub
return null;
}
@@ -379,7 +379,7 @@ public class MockedTrackedRaceWithStartTimeAndRanks implements TrackedRace {
}
@Override
public WindWithConfidence<UtilNew.Pair<Position, TimePoint>> getWindWithConfidence(Position p, TimePoint at) {
public WindWithConfidence<Util.Pair<Position, TimePoint>> getWindWithConfidence(Position p, TimePoint at) {
// TODO Auto-generated method stub
return null;
}
@@ -391,7 +391,7 @@ public class MockedTrackedRaceWithStartTimeAndRanks implements TrackedRace {
}
@Override
public WindWithConfidence<UtilNew.Pair<Position, TimePoint>> getWindWithConfidence(Position p, TimePoint at,
public WindWithConfidence<Util.Pair<Position, TimePoint>> getWindWithConfidence(Position p, TimePoint at,
Iterable<WindSource> windSourcesToExclude) {
// TODO Auto-generated method stub
return null;