Commit Graph
579 Commits
Author SHA1 Message Date
Alexander Ries d01cc74c75 removed getRaceExecutionOrderProvider() from TrackedRace interface 2015-06-16 17:42:08 +02:00
Alexander Ries a110ff1102 added getRaceExecutionOrderProvider() to TrackedRace 2015-06-16 15:51:18 +02:00
Alexander Ries cbaf85766d added boolean takesWind(Wind wind) Method to TrackedRace and did some renaming 2015-06-14 18:43:17 +02:00
Alexander Ries 223d3120a6 Refacoring with Axel 2015-06-08 15:52:54 +02:00
Alexander Ries 94b59f98a3 Set MockedTrackedRace back to last commit from master and adapted it to changed interfaces from dashboard 2015-06-02 13:10:21 +02:00
Alexander Ries c2a11cfd3b Solved master merge conlicts in TrackedRace and Regatta plus some of their mocks 2015-06-02 09:29:08 +02:00
Axel Uhl a581b24d60 Merge branch 'master' into bug1018 2015-05-30 11:06:24 +02:00
Axel Uhl 9c5bf2c3b1 switched from "windward distance to leader" to "windward distance to competitor farthest ahead" 2015-05-28 17:10:04 +02:00
Axel Uhl f522527d65 accelerated chart calculations by pre-calculating RankingInfo beforehand, then sharing 2015-05-28 16:12:09 +02:00
Axel Uhl 00b4a76f1c working on a solution for bug 2897: introduced NamedReentrantReadWriteLock for TrackedRegattaImpl.trackedRaces and notify listeners outside of locked area 2015-05-27 18:24:49 +02:00
Axel Uhl 8470c0b8d1 refactored RaceExecutionOrderProvider 2015-05-26 18:37:43 +02:00
Alexander Ries cc02a1e272 Added getPreviousRaceFromAttachedRaceExecutionOrderProviders() method to TrackedRace interface 2015-05-21 15:15:18 +02:00
Alexander Ries 73684d27c8 Revert "Merge remote-tracking branch 'server/ribdashboard' into ribdashboard"
This reverts commit 1fc692e4d3, reversing
changes made to 1c8bb3b414.
2015-05-21 14:53:49 +02:00
Axel Uhl 1fc692e4d3 Merge remote-tracking branch 'server/ribdashboard' into ribdashboard 2015-05-21 09:26:30 +02:00
Alexander Ries c408954881 added RaceExecutionOrderProvider ConcurrentHashMap to TrackedRaceImpl and implemented attach and detach method for RaceExecutionProviders in DynamicTrackedRace 2015-05-18 16:43:43 +02:00
Alexander Ries cf58de7a7c added implementations to RaceColumns from Series and FlexibleLeaderboard for getRaceExecutionOrderProvider 2015-05-18 15:22:46 +02:00
Alexander Ries bdd74dc1ce added attachRaceExecutionProvider method declaration to TrackedRace interface 2015-05-18 11:11:24 +02:00
Axel Uhl ba1fceecaa added fields to capture time-on-time / time-on-distance on competitor and pass values through all constructors and operations and JSON serialization 2015-05-14 20:10:20 +02:00
Axel Uhl 869967f5b6 Merge branch 'master' into bug1018
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLeg.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java

The merge conflict was largely caused by the introduction of target time estimation which conflicted with a few
new methods introduced on branch bug1018
2015-05-13 00:21:21 +02:00
Axel Uhl acb3b69878 added column to RegattaListComposite showing RankingMetric; moved a separate RankingMetrics enum to common to keep gwt.ui Java8-free 2015-05-12 22:04:45 +02:00
Axel Uhl 3c0555eb0f added persistence support for Regatta.getRankingMetric() and pulled the constructor parameter through many more constructor layers 2015-05-12 09:49:38 +02:00
Frederik Petersen 708770d5af Added new target time method using polar service
see bug2716
2015-05-11 11:58:15 +02:00
Alexander Ries 7ee0ad76fa Added inner RacesExecutionOrderCache class to TrackedRegatta and getPreviousRaceInExecutionOrder(...) Method 2015-05-01 15:10:15 +02:00
Axel Uhl 5fcb99964e Merge branch 'master' into bug1018
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
2015-04-27 10:26:45 +02:00
Axel Uhl ed61343693 fixing test Regatta mock implementations after adding method for ranking metric constructor 2015-04-25 00:13:28 +02:00
Frederik Petersen 9cff25eab8 Merge branch 'master' into bug2700
Conflicts:
	java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceResultOfCompetitorWithContext.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/PolarDataService.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
	java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java
	java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java
	java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/PolarResource.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
2015-04-23 13:36:00 +02:00
Frederik Petersen 6089c83613 Introduces polardataservice to tracked race
transient
can be null, needs to be handled accordingly
is null, if polar osgi bundle is stopped
2015-04-23 11:38:41 +02:00
Axel Uhl b62f6d9ac1 Merge branch 'master' into bug1018 2015-04-21 22:40:05 +02:00
Axel Uhl d334099dd0 made compileable again and removed warnings by consolidating imports 2015-04-21 10:44:44 +02:00
Axel Uhl 21ac8177c2 some more pass-through of WindLegTypeLegBearingCache for performance improvements; re-designed RankingMetric interface;
the new version of the interface returns a comparator for overall competitor ranking and a calculation for the time to improve
between a trailing and a leading competitor, determined in the trailing competitor's "time system." See bug 1018, comments
starting from #19.
2015-04-20 18:17:53 +02:00
Axel Uhl c1bf0240cf introduced caching method with default implementation in RankingMetric 2015-04-17 18:08:39 +02:00
Axel Uhl fb2e545bec added a trivial OneDesignRankingMetric; removed more NoWindException declarations that were no longer required 2015-04-17 17:54:21 +02:00
Axel Uhl 73b3bcef85 introduced new "*Corrected*" methods on TrackedRace and TrackedLegOfCompetitor; use Duration instead of Double / seconds for gap calculation results 2015-04-17 17:18:55 +02:00
fmittag 59248fcf49 added flagImageUrl as new attribute on competitor to enable custom flags (e.g. club flags) instead of the nation flags 2015-04-16 17:38:08 +02:00
Axel Uhl 68f70a8375 Merge branch 'master' into bug489
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
2015-04-07 13:20:54 +02:00
Axel Uhl 094234b654 moved all Position-related classes including Compact... representations to common bundle; provided CustomFieldSerializer for all Position subclasses that require it 2015-04-03 16:12:21 +02:00
Axel Uhl 58bd451481 moved other Position implementations to common packages to share them with GWT and make then GWT-serializable 2015-04-02 16:42:10 +02:00
fmittag 2f08fb7a4e added a new method getLastLegStarted(timepoint) on trackedRace to improve leg progress calculation 2015-04-02 16:32:50 +02:00
Axel Uhl 6972ac9171 replaced PositionDTO by Position and DegreePosition 2015-04-02 12:06:39 +02:00
Alexander Ries 50a32e3558 fixed conflicts in Dummy and Moqued TrackedRaces 2015-04-01 10:31:21 +02:00
Alexander Ries 8d3cb289d5 added getGateStartGolfDownTime() method to TrackedRace 2015-04-01 10:23:41 +02:00
Axel Uhl 44d7bb2d77 offering users to enable our own mark passing calculation also for SwissTiming live races 2015-03-31 17:35:16 +02:00
Axel Uhl e1e047bd75 Merge branch 'master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
	java/com.sap.sailing.domain/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaanalytics/RegattaAnalyticsDataManager.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/seriesanalytics/EventSeriesAnalyticsDataManager.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
2015-03-26 14:51:48 +01:00
Axel Uhl 911cdeb86b Merge branch 'master' into jbross-buoy-tender
Conflicts:
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
2015-03-23 20:52:00 +01:00
Axel Uhl f8c16d1049 Merge branch 'jbross-buoy-tender' into bug2724
Conflicts:
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingAdapterImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
2015-03-23 16:18:37 +01:00
Axel Uhl 641b02357f Merge branch 'master' into bug2715
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
2015-03-20 17:44:35 +01:00
Axel Uhl 103ffcdd3d fixed compilation error in test code after changes in LeaderboardPanel 2015-03-20 17:30:23 +01:00
Axel Uhl 495cd85bd0 added distance-considering-gate-start metric also at race level 2015-03-20 14:18:59 +01:00
Axel Uhl 5fd384af5c added metric for distance including gate start consideration to leaderboard and REST API 2015-03-20 13:34:44 +01:00
Jan Broß ec20a6042f Return latest known position if existent when pinging mark 2015-03-18 16:05:23 +01:00