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
5885a03e33
Merge branch 'master' into bug1018
2015-05-13 18:52:43 +02:00
Axel Uhl
cb6168e7fa
use CONSTRUCTOR fields to avoid serialization problems in test fragments
2015-05-13 14:53:24 +02:00
Jens Rommel
7a2c02716f
- Added filter logic to exclude media tracks not related to the scope of the current master data export.
...
- Extended tests.
2015-05-13 13:53:44 +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
Frederik Petersen
b0bf4950d8
Merge branch 'master' into bug2716
2015-05-12 22:35:09 +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
b7e4b9bcbf
Merge branch 'master' into bug1018
2015-05-12 10:49:55 +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
Christopher Ronnewinkel (D036654)
44e790b3e3
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
2015-05-11 12:50:19 +02:00
Frederik Petersen
708770d5af
Added new target time method using polar service
...
see bug2716
2015-05-11 11:58:15 +02:00
Axel Uhl
1dfc055e34
Merge branch 'master' into bug1018
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
2015-05-08 18:27:39 +02:00
Christopher Ronnewinkel (D036654)
951388ffc7
do not show 1-turners on reaching legs; skip superfluous steps in finishing 1-turner;
2015-05-08 16:17:09 +02:00
Frederik Petersen
c2cc1f53ff
Fixed race log tracking gpsfix import
...
confirmed working with SCGN regatta
this commit probably breaks compatibility for imports between servers on
new and older commit
2015-05-07 11:11:57 +02:00
Frederik Petersen
8fece8f5ca
Merge branch 'master' into bug2659
2015-05-07 09:51:37 +02:00
Axel Uhl
ece7378c4f
Merge branch 'master' into bug1018
2015-05-07 09:26:04 +02:00
Axel Uhl
181e5ee5b9
Merge branch 'master' into ubilabs--tracking_app--develop
2015-05-04 23:14:52 +02:00
Axel Uhl
a3d2fe771d
Merge branch 'master' into bug1018
2015-05-01 13:33:13 +02:00
Christopher Ronnewinkel (D036654)
b6f1136c51
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
2015-05-01 12:31:25 +02:00
Christopher Ronnewinkel (D036654)
b59811705b
fix check for sparse-simulation-data in polar-diagram-gps;
2015-05-01 12:29:41 +02:00
Frederik Petersen
3fd2bfd8a2
Fixes auto stat for polars
2015-05-01 10:54:19 +02:00
Frederik Petersen
09ccadddc1
Fixes of existing tracked races loaded into polarservice on redeploy
2015-05-01 10:28:59 +02:00
Axel Uhl
eaf7bed53f
Merge branch 'master' into bug1018
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2015-04-30 14:08:03 +02:00
Frederik Petersen
1cb580c589
Merge branch 'master' into bug2659
2015-04-30 13:37:40 +02:00
Frederik Petersen
a3dba5041b
GPSFixes of GPSFixStore are now imported during master data import
...
should fix bug 2659
2015-04-30 13:34:38 +02:00
Axel Uhl
6d20c02f17
added theme project to launch config
2015-04-30 01:11:33 +02:00
Axel Uhl
cfb1d6673b
Merge branch 'master' into bug1018
2015-04-30 00:51:33 +02:00
Axel Uhl
10c7da6e36
Merge branch 'master' into bug1018
2015-04-30 00:47:46 +02:00
Christopher Ronnewinkel (D036654)
43f1c7eeb9
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
2015-04-29 11:24:20 +02:00
Frederik Petersen
8af7e3954e
Fixed bug2762
...
When importing, we see if there is an equal fix (if yes, no database
insertion)
2015-04-29 10:19:45 +02:00
Christopher Ronnewinkel (D036654)
3e69f05216
check for zero-speed due to missing wind or polar data; extend get-even-timed-path for the case of two cornerpoints per step; scale turning step of finish-phase 1-turner to layline; fix plausibility check;
2015-04-29 09:36:00 +02:00
Bennet Brunsen
ff1b0c6f87
Merge branch 'master' into ubilabs--tracking_app--develop
2015-04-28 13:47:56 +02:00
Christopher Ronnewinkel (D036654)
797d3876d3
support start-line initialization in tree-grow-360; fix orientation in initial steps of opportunist-360;
2015-04-27 17:29:01 +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
Frederik Petersen
e807456eec
Fixed errors after merge
2015-04-25 16:35:39 +02:00
Frederik Petersen
ca2ac594f5
Merge branch 'master' into bug2700
...
Conflicts:
java/com.sap.sailing.server/META-INF/MANIFEST.MF
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPSDirect.java
2015-04-24 18:41:37 +02:00
Christopher Ronnewinkel (D036654)
93f1c21764
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
2015-04-24 13:53:24 +02:00
Axel Uhl
85b20d1a06
Merge branch 'master' into bug1018
2015-04-24 09:09:51 +02:00
Axel Uhl
c2db032c7b
Merge branch 'master' into ubilabs--tracking_app--develop
2015-04-23 23:42:07 +02:00
Axel Uhl
c7d6f62a75
fixing bug 2767 by also registering the old GPSFix(Moving)Impl type names with their old package locations for the Mongo persistence handler;
...
the commit in which the types were moved was 58bd451481
2015-04-23 15:41:08 +02:00
Christopher Ronnewinkel (D036654)
47f5a4ae51
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathCanvasOverlay.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/ReplayPathCanvasOverlay.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTracTrac.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTreeGrow.java
2015-04-23 14:33:48 +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
Frederik Petersen
f8f2ada89c
PolarDataService now uses OSGi service registry
...
preparation for being able to use polar data service in domain classes
2015-04-23 10:58:54 +02:00
Axel Uhl
18997d1159
Merge branch 'master' into ubilabs--tracking_app--develop
2015-04-22 14:55:23 +02:00
Axel Uhl
b62f6d9ac1
Merge branch 'master' into bug1018
2015-04-21 22:40:05 +02:00
Christopher Ronnewinkel (D036654)
4c395695db
support reaching steps in opportunist-360;
2015-04-21 22:35:56 +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