mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-06 12:23:55 +00:00
moved Pair and Triple from com.sap.sailing.common.Util to com.sap.sse.common.Util and introduced all missing dependencies on com.sap.sse.common
This commit is contained in:
1 parent
c4cea6660d
commit
0c47e86304
334 files changed
+1540
-1692
No files matched your search
@@ -14,6 +14,7 @@ Require-Bundle: com.sap.sailing.domain;bundle-version="1.0.0",
|
||||
com.sap.sailing.domain.common,
|
||||
com.sap.sailing.datamining.shared;bundle-version="1.0.0",
|
||||
com.sap.sse.datamining;bundle-version="1.0.0",
|
||||
com.sap.sse.datamining.shared;bundle-version="1.0.0"
|
||||
com.sap.sse.datamining.shared;bundle-version="1.0.0",
|
||||
com.sap.sse.common
|
||||
Bundle-ClassPath: .
|
||||
Bundle-Activator: com.sap.sailing.datamining.impl.Activator
|
||||
+9
-9
@@ -12,12 +12,12 @@ import com.sap.sailing.domain.base.CourseArea;
|
||||
import com.sap.sailing.domain.base.Fleet;
|
||||
import com.sap.sailing.domain.base.Leg;
|
||||
import com.sap.sailing.domain.base.RaceColumn;
|
||||
import com.sap.sailing.domain.common.impl.Util.Pair;
|
||||
import com.sap.sailing.domain.leaderboard.Leaderboard;
|
||||
import com.sap.sailing.domain.leaderboard.LeaderboardGroup;
|
||||
import com.sap.sailing.domain.tracking.TrackedLeg;
|
||||
import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor;
|
||||
import com.sap.sailing.domain.tracking.TrackedRace;
|
||||
import com.sap.sse.common.Util;
|
||||
import com.sap.sse.datamining.impl.workers.retrievers.AbstractRetrievalWorker;
|
||||
import com.sap.sse.datamining.workers.DataRetrievalWorker;
|
||||
|
||||
@@ -36,8 +36,8 @@ public abstract class AbstractLeaderboardGroupDataRetrievalWorker<DataType>
|
||||
return group;
|
||||
}
|
||||
|
||||
private static Collection<Pair<TrackedLeg, HasTrackedLegContext>> retrieveDataTillTrackedLeg(LeaderboardGroup group) {
|
||||
Collection<Pair<TrackedLeg, HasTrackedLegContext>> data = new ArrayList<Pair<TrackedLeg, HasTrackedLegContext>>();
|
||||
private static Collection<Util.Pair<TrackedLeg, HasTrackedLegContext>> retrieveDataTillTrackedLeg(LeaderboardGroup group) {
|
||||
Collection<Util.Pair<TrackedLeg, HasTrackedLegContext>> data = new ArrayList<Util.Pair<TrackedLeg, HasTrackedLegContext>>();
|
||||
for (Leaderboard leaderboard : group.getLeaderboards()) {
|
||||
CourseArea courseArea = leaderboard.getDefaultCourseArea();
|
||||
for (RaceColumn raceColumn : leaderboard.getRaceColumns()) {
|
||||
@@ -50,7 +50,7 @@ public abstract class AbstractLeaderboardGroupDataRetrievalWorker<DataType>
|
||||
if (trackedLeg != null) {
|
||||
HasTrackedLegContext dataContext = new HasTrackedLegContextImpl(group, leaderboard,
|
||||
courseArea, fleet, trackedRace, trackedLeg, legNumber);
|
||||
data.add(new Pair<TrackedLeg, HasTrackedLegContext>(trackedLeg, dataContext));
|
||||
data.add(new Util.Pair<TrackedLeg, HasTrackedLegContext>(trackedLeg, dataContext));
|
||||
legNumber++;
|
||||
}
|
||||
}
|
||||
@@ -61,18 +61,18 @@ public abstract class AbstractLeaderboardGroupDataRetrievalWorker<DataType>
|
||||
return data;
|
||||
}
|
||||
|
||||
protected static Collection<Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>> retrieveDataTillTrackedLegOfCompetitor(
|
||||
protected static Collection<Util.Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>> retrieveDataTillTrackedLegOfCompetitor(
|
||||
LeaderboardGroup group) {
|
||||
Collection<Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>> data = new ArrayList<Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>>();
|
||||
Collection<Pair<TrackedLeg, HasTrackedLegContext>> baseData = retrieveDataTillTrackedLeg(group);
|
||||
for (Pair<TrackedLeg, HasTrackedLegContext> baseDataEntry : baseData) {
|
||||
Collection<Util.Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>> data = new ArrayList<Util.Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>>();
|
||||
Collection<Util.Pair<TrackedLeg, HasTrackedLegContext>> baseData = retrieveDataTillTrackedLeg(group);
|
||||
for (Util.Pair<TrackedLeg, HasTrackedLegContext> baseDataEntry : baseData) {
|
||||
TrackedLeg trackedLeg = baseDataEntry.getA();
|
||||
HasTrackedLegContext trackedLegContext = baseDataEntry.getB();
|
||||
for (Competitor competitor : trackedLegContext.getTrackedRace().getRace().getCompetitors()) {
|
||||
TrackedLegOfCompetitor trackedLegOfCompetitor = trackedLeg.getTrackedLeg(competitor);
|
||||
HasTrackedLegOfCompetitorContext dataContext = new HasTrackedLegOfCompetitorContextImpl(trackedLegContext,
|
||||
competitor);
|
||||
data.add(new Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>(trackedLegOfCompetitor,
|
||||
data.add(new Util.Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>(trackedLegOfCompetitor,
|
||||
dataContext));
|
||||
}
|
||||
}
|
||||
|
||||
+4
-4
@@ -4,24 +4,24 @@ import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import com.sap.sailing.datamining.data.HasGPSFixContext;
|
||||
import com.sap.sailing.datamining.data.GPSFixWithContext;
|
||||
import com.sap.sailing.datamining.data.HasGPSFixContext;
|
||||
import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
|
||||
import com.sap.sailing.datamining.impl.components.AbstractLeaderboardGroupDataRetrievalWorker;
|
||||
import com.sap.sailing.datamining.impl.data.HasGPSFixContextImpl;
|
||||
import com.sap.sailing.domain.base.Competitor;
|
||||
import com.sap.sailing.domain.common.impl.Util.Pair;
|
||||
import com.sap.sailing.domain.tracking.GPSFixMoving;
|
||||
import com.sap.sailing.domain.tracking.GPSFixTrack;
|
||||
import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor;
|
||||
import com.sap.sse.common.Util;
|
||||
|
||||
public class GPSFixLeaderboardGroupDataRetrievalWorker extends AbstractLeaderboardGroupDataRetrievalWorker<GPSFixWithContext> {
|
||||
|
||||
@Override
|
||||
public Collection<GPSFixWithContext> doWork() {
|
||||
Collection<GPSFixWithContext> data = new ArrayList<GPSFixWithContext>();
|
||||
Collection<Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>> baseData = retrieveDataTillTrackedLegOfCompetitor(getGroup());
|
||||
for (Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext> baseDataEntry : baseData) {
|
||||
Collection<Util.Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>> baseData = retrieveDataTillTrackedLegOfCompetitor(getGroup());
|
||||
for (Util.Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext> baseDataEntry : baseData) {
|
||||
HasGPSFixContext context = new HasGPSFixContextImpl(baseDataEntry.getB());
|
||||
data.addAll(retrieveDataFor(context));
|
||||
}
|
||||
|
||||
+1
-1
@@ -2,8 +2,8 @@ package com.sap.sailing.datamining.impl.gps_fix;
|
||||
|
||||
import com.sap.sailing.datamining.Clusters.WindStrength;
|
||||
import com.sap.sailing.datamining.WindStrengthCluster;
|
||||
import com.sap.sailing.datamining.data.HasGPSFixContext;
|
||||
import com.sap.sailing.datamining.data.GPSFixWithContext;
|
||||
import com.sap.sailing.datamining.data.HasGPSFixContext;
|
||||
import com.sap.sailing.domain.common.LegType;
|
||||
import com.sap.sailing.domain.common.Position;
|
||||
import com.sap.sailing.domain.common.SpeedWithBearing;
|
||||
|
||||
+3
-3
@@ -6,16 +6,16 @@ import java.util.Collection;
|
||||
import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
|
||||
import com.sap.sailing.datamining.data.TrackedLegOfCompetitorWithContext;
|
||||
import com.sap.sailing.datamining.impl.components.AbstractLeaderboardGroupDataRetrievalWorker;
|
||||
import com.sap.sailing.domain.common.impl.Util.Pair;
|
||||
import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor;
|
||||
import com.sap.sse.common.Util;
|
||||
|
||||
public class TrackedLegOfCompetitorLeaderboardGroupDataRetrievalWorker extends AbstractLeaderboardGroupDataRetrievalWorker<TrackedLegOfCompetitorWithContext> {
|
||||
|
||||
@Override
|
||||
public Collection<TrackedLegOfCompetitorWithContext> doWork() {
|
||||
Collection<TrackedLegOfCompetitorWithContext> data = new ArrayList<TrackedLegOfCompetitorWithContext>();
|
||||
Collection<Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>> baseData = retrieveDataTillTrackedLegOfCompetitor(getGroup());
|
||||
for (Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext> baseDataEntry : baseData) {
|
||||
Collection<Util.Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>> baseData = retrieveDataTillTrackedLegOfCompetitor(getGroup());
|
||||
for (Util.Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext> baseDataEntry : baseData) {
|
||||
data.add(new TrackedLegOfCompetitorWithContextImpl(baseDataEntry.getA(), baseDataEntry.getB()));
|
||||
}
|
||||
return data;
|
||||
|
||||
Reference in new issue
Block a user