eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-07 21:01:03 +00:00
Code Activity

Renamed the context interfaces and classes

Browse Source
This commit is contained in:
Lennart Hensler committed 2014-03-10 11:43:30 +01:00
1 parent 304e5ec71b
commit f0d29c4555
12 files changed
+51 -51
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/GPSFixContext.java
-5
View File
@@ -1,5 +0,0 @@
package com.sap.sailing.datamining.data;
public interface GPSFixContext extends TrackedLegOfCompetitorContext {
}
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasGPSFixContext.java
+5
View File
@@ -0,0 +1,5 @@
package com.sap.sailing.datamining.data;
public interface HasGPSFixContext extends HasTrackedLegOfCompetitorContext {
}
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/TrackedLegContext.java → java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasTrackedLegContext.java
+1 -1
View File
@@ -8,7 +8,7 @@ import com.sap.sailing.domain.leaderboard.LeaderboardGroup;
import com.sap.sailing.domain.tracking.TrackedLeg;
import com.sap.sailing.domain.tracking.TrackedRace;
public interface TrackedLegContext {
public interface HasTrackedLegContext {
public LeaderboardGroup getLeaderboardGroup();
public Leaderboard getLeaderboard();
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/TrackedLegOfCompetitorContext.java → java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasTrackedLegOfCompetitorContext.java
+1 -1
View File
@@ -2,7 +2,7 @@ package com.sap.sailing.datamining.data;
import com.sap.sailing.domain.base.Competitor;
public interface TrackedLegOfCompetitorContext extends TrackedLegContext {
public interface HasTrackedLegOfCompetitorContext extends HasTrackedLegContext {
public Competitor getCompetitor();
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/AbstractLeaderboardGroupDataRetrievalWorker.java
+15 -15
View File
@@ -3,10 +3,10 @@ package com.sap.sailing.datamining.impl.components;
import java.util.ArrayList;
import java.util.Collection;
import com.sap.sailing.datamining.data.TrackedLegContext;
import com.sap.sailing.datamining.data.TrackedLegOfCompetitorContext;
import com.sap.sailing.datamining.impl.data.TrackedLegContextImpl;
import com.sap.sailing.datamining.impl.data.TrackedLegOfCompetitorContextImpl;
import com.sap.sailing.datamining.data.HasTrackedLegContext;
import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
import com.sap.sailing.datamining.impl.data.HasTrackedLegContextImpl;
import com.sap.sailing.datamining.impl.data.HasTrackedLegOfCompetitorContextImpl;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.CourseArea;
import com.sap.sailing.domain.base.Fleet;
@@ -36,8 +36,8 @@ public abstract class AbstractLeaderboardGroupDataRetrievalWorker<DataType>
return group;
}
private static Collection<Pair<TrackedLeg, TrackedLegContext>> retrieveDataTillTrackedLeg(LeaderboardGroup group) {
Collection<Pair<TrackedLeg, TrackedLegContext>> data = new ArrayList<Pair<TrackedLeg, TrackedLegContext>>();
private static Collection<Pair<TrackedLeg, HasTrackedLegContext>> retrieveDataTillTrackedLeg(LeaderboardGroup group) {
Collection<Pair<TrackedLeg, HasTrackedLegContext>> data = new ArrayList<Pair<TrackedLeg, HasTrackedLegContext>>();
for (Leaderboard leaderboard : group.getLeaderboards()) {
CourseArea courseArea = leaderboard.getDefaultCourseArea();
for (RaceColumn raceColumn : leaderboard.getRaceColumns()) {
@@ -48,9 +48,9 @@ public abstract class AbstractLeaderboardGroupDataRetrievalWorker<DataType>
for (Leg leg : trackedRace.getRace().getCourse().getLegs()) {
TrackedLeg trackedLeg = trackedRace.getTrackedLeg(leg);
if (trackedLeg != null) {
TrackedLegContext dataContext = new TrackedLegContextImpl(group, leaderboard,
HasTrackedLegContext dataContext = new HasTrackedLegContextImpl(group, leaderboard,
courseArea, fleet, trackedRace, trackedLeg, legNumber);
data.add(new Pair<TrackedLeg, TrackedLegContext>(trackedLeg, dataContext));
data.add(new Pair<TrackedLeg, HasTrackedLegContext>(trackedLeg, dataContext));
legNumber++;
}
}
@@ -61,18 +61,18 @@ public abstract class AbstractLeaderboardGroupDataRetrievalWorker<DataType>
return data;
}
protected static Collection<Pair<TrackedLegOfCompetitor, TrackedLegOfCompetitorContext>> retrieveDataTillTrackedLegOfCompetitor(
protected static Collection<Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>> retrieveDataTillTrackedLegOfCompetitor(
LeaderboardGroup group) {
Collection<Pair<TrackedLegOfCompetitor, TrackedLegOfCompetitorContext>> data = new ArrayList<Pair<TrackedLegOfCompetitor, TrackedLegOfCompetitorContext>>();
Collection<Pair<TrackedLeg, TrackedLegContext>> baseData = retrieveDataTillTrackedLeg(group);
for (Pair<TrackedLeg, TrackedLegContext> baseDataEntry : baseData) {
Collection<Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>> data = new ArrayList<Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>>();
Collection<Pair<TrackedLeg, HasTrackedLegContext>> baseData = retrieveDataTillTrackedLeg(group);
for (Pair<TrackedLeg, HasTrackedLegContext> baseDataEntry : baseData) {
TrackedLeg trackedLeg = baseDataEntry.getA();
TrackedLegContext trackedLegContext = baseDataEntry.getB();
HasTrackedLegContext trackedLegContext = baseDataEntry.getB();
for (Competitor competitor : trackedLegContext.getTrackedRace().getRace().getCompetitors()) {
TrackedLegOfCompetitor trackedLegOfCompetitor = trackedLeg.getTrackedLeg(competitor);
TrackedLegOfCompetitorContext dataContext = new TrackedLegOfCompetitorContextImpl(trackedLegContext,
HasTrackedLegOfCompetitorContext dataContext = new HasTrackedLegOfCompetitorContextImpl(trackedLegContext,
competitor);
data.add(new Pair<TrackedLegOfCompetitor, TrackedLegOfCompetitorContext>(trackedLegOfCompetitor,
data.add(new Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>(trackedLegOfCompetitor,
dataContext));
}
}
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/GPSFixContextImpl.java → java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/HasGPSFixContextImpl.java
+5 -5
View File
@@ -1,7 +1,7 @@
package com.sap.sailing.datamining.impl.data;
import com.sap.sailing.datamining.data.GPSFixContext;
import com.sap.sailing.datamining.data.TrackedLegOfCompetitorContext;
import com.sap.sailing.datamining.data.HasGPSFixContext;
import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.CourseArea;
import com.sap.sailing.domain.base.Fleet;
@@ -10,14 +10,14 @@ import com.sap.sailing.domain.leaderboard.LeaderboardGroup;
import com.sap.sailing.domain.tracking.TrackedLeg;
import com.sap.sailing.domain.tracking.TrackedRace;
public class GPSFixContextImpl extends TrackedLegOfCompetitorContextImpl implements GPSFixContext {
public class HasGPSFixContextImpl extends HasTrackedLegOfCompetitorContextImpl implements HasGPSFixContext {
public GPSFixContextImpl(LeaderboardGroup leaderboardGroup, Leaderboard leaderboard, CourseArea courseArea,
public HasGPSFixContextImpl(LeaderboardGroup leaderboardGroup, Leaderboard leaderboard, CourseArea courseArea,
Fleet fleet, TrackedRace trackedRace, TrackedLeg trackedLeg, int legNumber, Competitor competitor) {
super(leaderboardGroup, leaderboard, courseArea, fleet, trackedRace, trackedLeg, legNumber, competitor);
}
public GPSFixContextImpl(TrackedLegOfCompetitorContext baseContext) {
public HasGPSFixContextImpl(HasTrackedLegOfCompetitorContext baseContext) {
this(baseContext.getLeaderboardGroup(), baseContext.getLeaderboard(), baseContext.getCourseArea(), baseContext.getFleet(),
baseContext.getTrackedRace(), baseContext.getTrackedLeg(), baseContext.getLegNumber(),
baseContext.getCompetitor());
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedLegContextImpl.java → java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/HasTrackedLegContextImpl.java
+3 -3
View File
@@ -2,7 +2,7 @@ package com.sap.sailing.datamining.impl.data;
import java.util.Calendar;
import com.sap.sailing.datamining.data.TrackedLegContext;
import com.sap.sailing.datamining.data.HasTrackedLegContext;
import com.sap.sailing.domain.base.CourseArea;
import com.sap.sailing.domain.base.Fleet;
import com.sap.sailing.domain.common.LegType;
@@ -15,7 +15,7 @@ import com.sap.sailing.domain.tracking.TrackedLeg;
import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor;
import com.sap.sailing.domain.tracking.TrackedRace;
public class TrackedLegContextImpl implements TrackedLegContext {
public class HasTrackedLegContextImpl implements HasTrackedLegContext {
private LeaderboardGroup leaderboardGroup;
private Leaderboard leaderboard;
@@ -30,7 +30,7 @@ public class TrackedLegContextImpl implements TrackedLegContext {
private boolean legTypeHasBeenInitialized;
private boolean yearHasBeenInitialized;
public TrackedLegContextImpl(LeaderboardGroup leaderboardGroup, Leaderboard leaderboard, CourseArea courseArea, Fleet fleet,
public HasTrackedLegContextImpl(LeaderboardGroup leaderboardGroup, Leaderboard leaderboard, CourseArea courseArea, Fleet fleet,
TrackedRace trackedRace, TrackedLeg trackedLeg, int legNumber) {
this.leaderboardGroup = leaderboardGroup;
this.leaderboard = leaderboard;
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedLegOfCompetitorContextImpl.java → java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/HasTrackedLegOfCompetitorContextImpl.java
+5 -5
View File
@@ -1,7 +1,7 @@
package com.sap.sailing.datamining.impl.data;
import com.sap.sailing.datamining.data.TrackedLegContext;
import com.sap.sailing.datamining.data.TrackedLegOfCompetitorContext;
import com.sap.sailing.datamining.data.HasTrackedLegContext;
import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.CourseArea;
import com.sap.sailing.domain.base.Fleet;
@@ -10,17 +10,17 @@ import com.sap.sailing.domain.leaderboard.LeaderboardGroup;
import com.sap.sailing.domain.tracking.TrackedLeg;
import com.sap.sailing.domain.tracking.TrackedRace;
public class TrackedLegOfCompetitorContextImpl extends TrackedLegContextImpl implements TrackedLegOfCompetitorContext {
public class HasTrackedLegOfCompetitorContextImpl extends HasTrackedLegContextImpl implements HasTrackedLegOfCompetitorContext {
private Competitor competitor;
public TrackedLegOfCompetitorContextImpl(LeaderboardGroup leaderboardGroup, Leaderboard leaderboard,
public HasTrackedLegOfCompetitorContextImpl(LeaderboardGroup leaderboardGroup, Leaderboard leaderboard,
CourseArea courseArea, Fleet fleet, TrackedRace trackedRace, TrackedLeg trackedLeg, int legNumber, Competitor competitor) {
super(leaderboardGroup, leaderboard, courseArea, fleet, trackedRace, trackedLeg, legNumber);
this.competitor = competitor;
}
public TrackedLegOfCompetitorContextImpl(TrackedLegContext trackedLegContext, Competitor competitor) {
public HasTrackedLegOfCompetitorContextImpl(HasTrackedLegContext trackedLegContext, Competitor competitor) {
this(trackedLegContext.getLeaderboardGroup(), trackedLegContext.getLeaderboard(), trackedLegContext.getCourseArea(),
trackedLegContext.getFleet(), trackedLegContext.getTrackedRace(), trackedLegContext.getTrackedLeg(), trackedLegContext.getLegNumber(),
competitor);
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/gps_fix/GPSFixLeaderboardGroupDataRetrievalWorker.java
+7 -7
View File
@@ -4,11 +4,11 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import com.sap.sailing.datamining.data.GPSFixContext;
import com.sap.sailing.datamining.data.HasGPSFixContext;
import com.sap.sailing.datamining.data.GPSFixWithContext;
import com.sap.sailing.datamining.data.TrackedLegOfCompetitorContext;
import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
import com.sap.sailing.datamining.impl.components.AbstractLeaderboardGroupDataRetrievalWorker;
import com.sap.sailing.datamining.impl.data.GPSFixContextImpl;
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;
@@ -20,15 +20,15 @@ public class GPSFixLeaderboardGroupDataRetrievalWorker extends AbstractLeaderboa
@Override
public Collection<GPSFixWithContext> doWork() {
Collection<GPSFixWithContext> data = new ArrayList<GPSFixWithContext>();
Collection<Pair<TrackedLegOfCompetitor, TrackedLegOfCompetitorContext>> baseData = retrieveDataTillTrackedLegOfCompetitor(getGroup());
for (Pair<TrackedLegOfCompetitor, TrackedLegOfCompetitorContext> baseDataEntry : baseData) {
GPSFixContext context = new GPSFixContextImpl(baseDataEntry.getB());
Collection<Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>> baseData = retrieveDataTillTrackedLegOfCompetitor(getGroup());
for (Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext> baseDataEntry : baseData) {
HasGPSFixContext context = new HasGPSFixContextImpl(baseDataEntry.getB());
data.addAll(retrieveDataFor(context));
}
return data;
}
private Collection<GPSFixWithContext> retrieveDataFor(GPSFixContext context) {
private Collection<GPSFixWithContext> retrieveDataFor(HasGPSFixContext context) {
List<GPSFixWithContext> data = new ArrayList<GPSFixWithContext>();
TrackedLegOfCompetitor trackedLegOfCompetitor = context.getTrackedLeg().getTrackedLeg(context.getCompetitor());
GPSFixTrack<Competitor, GPSFixMoving> competitorTrack = context.getTrackedRace().getTrack(context.getCompetitor());
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/gps_fix/GPSFixWithContextImpl.java
+3 -3
View File
@@ -2,7 +2,7 @@ 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.GPSFixContext;
import com.sap.sailing.datamining.data.HasGPSFixContext;
import com.sap.sailing.datamining.data.GPSFixWithContext;
import com.sap.sailing.domain.common.LegType;
import com.sap.sailing.domain.common.Position;
@@ -18,12 +18,12 @@ import com.sap.sailing.domain.tracking.impl.GPSFixMovingImpl;
public class GPSFixWithContextImpl extends GPSFixMovingImpl implements GPSFixWithContext {
private static final long serialVersionUID = -5551381302809417831L;
private GPSFixContext context;
private HasGPSFixContext context;
private Wind wind;
private boolean windHasBeenInitialized;
public GPSFixWithContextImpl(GPSFixMoving gpsFix, GPSFixContext context) {
public GPSFixWithContextImpl(GPSFixMoving gpsFix, HasGPSFixContext context) {
super(copyPosition(gpsFix), copyTimePoint(gpsFix), copySpeed(gpsFix));
this.context = context;
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/tracked_leg_of_competitor/TrackedLegOfCompetitorLeaderboardGroupDataRetrievalWorker.java
+3 -3
View File
@@ -3,7 +3,7 @@ package com.sap.sailing.datamining.impl.tracked_leg_of_competitor;
import java.util.ArrayList;
import java.util.Collection;
import com.sap.sailing.datamining.data.TrackedLegOfCompetitorContext;
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;
@@ -14,8 +14,8 @@ public class TrackedLegOfCompetitorLeaderboardGroupDataRetrievalWorker extends A
@Override
public Collection<TrackedLegOfCompetitorWithContext> doWork() {
Collection<TrackedLegOfCompetitorWithContext> data = new ArrayList<TrackedLegOfCompetitorWithContext>();
Collection<Pair<TrackedLegOfCompetitor, TrackedLegOfCompetitorContext>> baseData = retrieveDataTillTrackedLegOfCompetitor(getGroup());
for (Pair<TrackedLegOfCompetitor, TrackedLegOfCompetitorContext> baseDataEntry : baseData) {
Collection<Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>> baseData = retrieveDataTillTrackedLegOfCompetitor(getGroup());
for (Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext> baseDataEntry : baseData) {
data.add(new TrackedLegOfCompetitorWithContextImpl(baseDataEntry.getA(), baseDataEntry.getB()));
}
return data;
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/tracked_leg_of_competitor/TrackedLegOfCompetitorWithContextImpl.java
+3 -3
View File
@@ -1,7 +1,7 @@
package com.sap.sailing.datamining.impl.tracked_leg_of_competitor;
import com.sap.sailing.datamining.WindStrengthCluster;
import com.sap.sailing.datamining.data.TrackedLegOfCompetitorContext;
import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
import com.sap.sailing.datamining.data.TrackedLegOfCompetitorWithContext;
import com.sap.sailing.domain.common.Distance;
import com.sap.sailing.domain.common.LegType;
@@ -11,9 +11,9 @@ import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor;
public class TrackedLegOfCompetitorWithContextImpl implements TrackedLegOfCompetitorWithContext {
private TrackedLegOfCompetitor trackedLegOfCompetitor;
private TrackedLegOfCompetitorContext context;
private HasTrackedLegOfCompetitorContext context;
public TrackedLegOfCompetitorWithContextImpl(TrackedLegOfCompetitor trackedLegOfCompetitor, TrackedLegOfCompetitorContext context) {
public TrackedLegOfCompetitorWithContextImpl(TrackedLegOfCompetitor trackedLegOfCompetitor, HasTrackedLegOfCompetitorContext context) {
this.trackedLegOfCompetitor = trackedLegOfCompetitor;
this.context = context;
}