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

removed OSCAR flag for now from SWC start procedure

Browse Source
This commit is contained in:
fmittag committed 2016-12-02 11:32:24 +01:00
1 parent ecdbfb579a
commit 2654010347
2 files changed
+21 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/impl/RaceStateEvents.java
+2 -2
View File
@@ -9,10 +9,10 @@ public enum RaceStateEvents {
RRS26_STARTMODE_UP, RRS26_STARTMODE_UP,
RRS26_STARTMODE_DOWN, RRS26_STARTMODE_DOWN,
SWC_CLASS_OVER_OSCAR_UP, SWC_CLASS_UP,
SWC_STARTMODE_UP, SWC_STARTMODE_UP,
SWC_STARTMODE_DOWN, SWC_STARTMODE_DOWN,
SWC_CLASS_OVER_OSCAR_DOWN, SWC_CLASS_DOWN,
ESS_AP_DOWN, ESS_AP_DOWN,
ESS_THREE_UP, ESS_THREE_UP,
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/SWCRacingProcedureImpl.java
+19 -19
View File
@@ -21,8 +21,8 @@ import com.sap.sse.common.TimePoint;
public class SWCRacingProcedureImpl extends ConfigurableStartModeFlagRacingProcedureImpl implements SWCRacingProcedure { public class SWCRacingProcedureImpl extends ConfigurableStartModeFlagRacingProcedureImpl implements SWCRacingProcedure {
private final static long CLASS_AND_OSCAR_AND_STARTMODE_UP_INTERVAL = 6 * 60 * 1000; // 6 minutes before start private final static long CLASS_AND_STARTMODE_UP_INTERVAL = 6 * 60 * 1000; // 6 minutes before start
private final static long CLASS_AND_OSCAR_AND_STARTMODE_DOWN_INTERVAL = 1 * 60 * 1000; // 1 minute after start private final static long CLASS_AND_STARTMODE_DOWN_INTERVAL = 1 * 60 * 1000; // 1 minute after start
public SWCRacingProcedureImpl(RaceLog raceLog, AbstractLogEventAuthor author, public SWCRacingProcedureImpl(RaceLog raceLog, AbstractLogEventAuthor author,
SWCStartConfiguration configuration, RaceLogResolver raceLogResolver) { SWCStartConfiguration configuration, RaceLogResolver raceLogResolver) {
@@ -31,7 +31,7 @@ public class SWCRacingProcedureImpl extends ConfigurableStartModeFlagRacingProce
@Override @Override
protected long getStartPhaseStartModeUpInterval() { protected long getStartPhaseStartModeUpInterval() {
return CLASS_AND_OSCAR_AND_STARTMODE_UP_INTERVAL; return CLASS_AND_STARTMODE_UP_INTERVAL;
} }
@Override @Override
@@ -63,17 +63,17 @@ public class SWCRacingProcedureImpl extends ConfigurableStartModeFlagRacingProce
@Override @Override
public boolean isStartphaseActive(TimePoint startTime, TimePoint now) { public boolean isStartphaseActive(TimePoint startTime, TimePoint now) {
return now.before(startTime.minus(CLASS_AND_OSCAR_AND_STARTMODE_UP_INTERVAL)); return now.before(startTime.minus(CLASS_AND_STARTMODE_UP_INTERVAL));
} }
@Override @Override
protected Collection<RaceStateEvent> createStartStateEvents(TimePoint startTime) { protected Collection<RaceStateEvent> createStartStateEvents(TimePoint startTime) {
return Arrays.<RaceStateEvent> asList( return Arrays.<RaceStateEvent> asList(
new RaceStateEventImpl(startTime.minus(CLASS_AND_OSCAR_AND_STARTMODE_UP_INTERVAL), RaceStateEvents.SWC_CLASS_OVER_OSCAR_UP), new RaceStateEventImpl(startTime.minus(CLASS_AND_STARTMODE_UP_INTERVAL), RaceStateEvents.SWC_CLASS_UP),
new RaceStateEventImpl(startTime.minus(CLASS_AND_OSCAR_AND_STARTMODE_UP_INTERVAL), RaceStateEvents.SWC_STARTMODE_UP), new RaceStateEventImpl(startTime.minus(CLASS_AND_STARTMODE_UP_INTERVAL), RaceStateEvents.SWC_STARTMODE_UP),
new RaceStateEventImpl(startTime, RaceStateEvents.START), new RaceStateEventImpl(startTime, RaceStateEvents.START),
new RaceStateEventImpl(startTime.plus(CLASS_AND_OSCAR_AND_STARTMODE_DOWN_INTERVAL), RaceStateEvents.SWC_STARTMODE_DOWN), new RaceStateEventImpl(startTime.plus(CLASS_AND_STARTMODE_DOWN_INTERVAL), RaceStateEvents.SWC_STARTMODE_DOWN),
new RaceStateEventImpl(startTime.plus(CLASS_AND_OSCAR_AND_STARTMODE_DOWN_INTERVAL), RaceStateEvents.SWC_CLASS_OVER_OSCAR_DOWN)); new RaceStateEventImpl(startTime.plus(CLASS_AND_STARTMODE_DOWN_INTERVAL), RaceStateEvents.SWC_CLASS_DOWN));
} }
@Override @Override
@@ -83,9 +83,9 @@ public class SWCRacingProcedureImpl extends ConfigurableStartModeFlagRacingProce
if (!startmodeFlagHasBeenSet()) { if (!startmodeFlagHasBeenSet()) {
setStartModeFlag(event.getTimePoint(), cachedStartmodeFlag); setStartModeFlag(event.getTimePoint(), cachedStartmodeFlag);
} }
case SWC_CLASS_OVER_OSCAR_UP: case SWC_CLASS_UP:
case SWC_STARTMODE_DOWN: case SWC_STARTMODE_DOWN:
case SWC_CLASS_OVER_OSCAR_DOWN: case SWC_CLASS_DOWN:
getChangedListeners().onActiveFlagsChanged(this); getChangedListeners().onActiveFlagsChanged(this);
return true; return true;
default: default:
@@ -98,18 +98,18 @@ public class SWCRacingProcedureImpl extends ConfigurableStartModeFlagRacingProce
Flags classFlag = getConfiguration().getClassFlag() != null ? Flags classFlag = getConfiguration().getClassFlag() != null ?
getConfiguration().getClassFlag() : Flags.CLASS; getConfiguration().getClassFlag() : Flags.CLASS;
if (now.before(startTime.minus(CLASS_AND_OSCAR_AND_STARTMODE_UP_INTERVAL))) { if (now.before(startTime.minus(CLASS_AND_STARTMODE_UP_INTERVAL))) {
return new FlagPoleState( return new FlagPoleState(
Arrays.asList(new FlagPole(classFlag, Flags.OSCAR, false), new FlagPole(cachedStartmodeFlag, false)), Arrays.asList(new FlagPole(classFlag, false), new FlagPole(cachedStartmodeFlag, false)),
null, null,
Arrays.asList(new FlagPole(classFlag, Flags.OSCAR, true), new FlagPole(cachedStartmodeFlag, true)), Arrays.asList(new FlagPole(classFlag, true), new FlagPole(cachedStartmodeFlag, true)),
startTime.minus(CLASS_AND_OSCAR_AND_STARTMODE_UP_INTERVAL)); startTime.minus(CLASS_AND_STARTMODE_UP_INTERVAL));
} else if (now.before(startTime.plus(CLASS_AND_OSCAR_AND_STARTMODE_DOWN_INTERVAL))) { } else if (now.before(startTime.plus(CLASS_AND_STARTMODE_DOWN_INTERVAL))) {
return new FlagPoleState( return new FlagPoleState(
Arrays.asList(new FlagPole(classFlag, Flags.OSCAR, true), new FlagPole(cachedStartmodeFlag, true)), Arrays.asList(new FlagPole(classFlag, true), new FlagPole(cachedStartmodeFlag, true)),
startTime.minus(CLASS_AND_OSCAR_AND_STARTMODE_UP_INTERVAL), startTime.minus(CLASS_AND_STARTMODE_UP_INTERVAL),
Arrays.asList(new FlagPole(classFlag, Flags.OSCAR, false), new FlagPole(cachedStartmodeFlag, false)), Arrays.asList(new FlagPole(classFlag, false), new FlagPole(cachedStartmodeFlag, false)),
startTime.plus(CLASS_AND_OSCAR_AND_STARTMODE_DOWN_INTERVAL)); startTime.plus(CLASS_AND_STARTMODE_DOWN_INTERVAL));
} else { } else {
if (isIndividualRecallDisplayed(now)) { if (isIndividualRecallDisplayed(now)) {
return new FlagPoleState( return new FlagPoleState(