Merge remote-tracking branch 'origin/master' into foiling

This commit is contained in:
Benjamin Barth committed 2016-04-22 17:38:10 +02:00
commit 6a52cbc84f
5 files changed
+35 -6

No files matched your search

@@ -17,4 +17,21 @@ public interface SeriesBase extends Renamable {
* on the scoring scheme (usually, medal races scores are doubled and cannot be discarded).
*/
boolean isMedal();
/**
* For a multi-{@link #getFleets() fleet} series, the races of different fleets may or may not run in parallel. If
* they can not run in parallel, the fleet's ordering as returned by {@link #getFleets()} is assumed to be the order
* in which the fleets' races are to be run.
* <p>
*
* For example, if a league event defines a series with three fleets, Yellow, Blue and Red, and does not allow for
* parallel fleet races and the series has race columns F1, F2, ..., then the execution order of those races is
* assumed to be F1-Yellow, F1-Blue, F1-Red, F2-Yellow, F2-Blue, F2-Red, ...
* <p>
*
* If the fleets are allowed to run their races in parallel, no assumption about the race execution order can be
* made except that within a fleet the races are usually run in the order as defined by the {@link #getRaceColumns()
* race columns}.
*/
boolean isFleetsRunInParallel();
}
@@ -45,4 +45,9 @@ public class SeriesWithRowsImpl implements SeriesWithRows {
this.name = newName;
}
@Override
public boolean isFleetsRunInParallel() {
// TODO This is a default implementation so far, allowing for parallel fleet races to not restrict generality. This shall become a configurable series property. See bug 3532
return true;
}
}
@@ -434,4 +434,10 @@ public class SeriesImpl extends RenamableImpl implements Series, RaceColumnListe
public boolean hasSplitFleetContiguousScoring() {
return hasSplitFleetContiguousScoring;
}
@Override
public boolean isFleetsRunInParallel() {
// TODO This is a default implementation so far, allowing for parallel fleet races to not restrict generality. This shall become a configurable series property. See bug 3532
return true;
}
}
+6 -5
View File
@@ -7,7 +7,8 @@
#### Servers
- Web Server: ec2-54-229-94-254.eu-west-1.compute.amazonaws.com
- Database and Queue Server: 172.31.25.253
- Database Server: dbserver.internal.sapsailing.com
- Database and Queue Server: rabbit.internal.sapsailing.com
#### Starting an instance
@@ -40,9 +41,9 @@ BUILD_COMPLETE_NOTIFY=you@email.com
SERVER_STARTUP_NOTIFY=
SERVER_NAME=MYSPECIFICEVENT
MEMORY=2048m
REPLICATION_HOST=172.31.25.253
REPLICATION_HOST=rabbit.internal.sapsailing.com
REPLICATION_CHANNEL=myspecificevent
MONGODB_HOST=172.31.25.253
MONGODB_HOST=dbserver.internal.sapsailing.com
MONGODB_PORT=10202
MONGODB_NAME=myspecificevent
</pre>
@@ -206,11 +207,11 @@ BUILD_COMPLETE_NOTIFY=simon.marcel.pamies@sap.com
SERVER_STARTUP_NOTIFY=
SERVER_NAME=LIVE1
MEMORY=2048m
REPLICATION_HOST=172.31.25.253
REPLICATION_HOST=rabbit.internal.sapsailing.com
REPLICATION_CHANNEL=sapsailinganalytics-live
TELNET_PORT=14888
SERVER_PORT=8888
MONGODB_HOST=172.31.25.253
MONGODB_HOST=dbserver.internal.sapsailing.com
MONGODB_PORT=10202
EXPEDITION_PORT=2010
REPLICATE_ON_START=False
+1 -1
View File
@@ -60,7 +60,7 @@ First of all, make sure you've looked at http://www.amazon.de/Patterns-Elements-
* Check that JDK 1.7 has been matched to JavaSE-1.7 and that JDK 1.8 has been matched to JavaSE-1.8 (...>Installed JREs>Execution Environments)
* It is also possible to match the SAPJVM 7 or 8 to JavaSE-1.7 / JavaSE-1.8 (for profiling purposes)
* Go to Windows->Preferences->Google->Errors/Warnings and set "Missing SDK" to "Ignore"
* Import all Race Analysis projects from the `java/` subdirectory of the git main folder
* Import all Race Analysis projects from the `java/` subdirectory of the git main folder (make sure to import as a git project in eclipse)
* Import all projects from the `mobile/` subdirectory of the git main folder; this in particular contains the race committee app projects
* Set the Eclipse target platform to race-analysis-p2-remote.target (located in com.sap.sailing.targetplatform/definitions)
* Wait until the target platform has been resolved completely