Commit Graph
1739 Commits
Author SHA1 Message Date
Christopher Ronnewinkel (D036654) 6360e2d9e6 Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation 2015-06-03 16:15:24 +02:00
Christopher Ronnewinkel (D036654) 0a72918e28 support finish-gate; let opportunist left/right start from corresponding side of start-line in most promising direction (not necessarily left/right); 2015-06-03 15:26:17 +02:00
Axel Uhl a581b24d60 Merge branch 'master' into bug1018 2015-05-30 11:06:24 +02:00
Axel Uhl 53f1e1b7d6 fixed windward distance so it's not to the leader but to the boat farthest ahead 2015-05-28 19:28:33 +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 82757a685c pass RankingInfo through to getLegGapToLegLeaderInOwnTime as a preparation for a performance fix 2015-05-28 10:54:39 +02:00
Axel Uhl 38d757e9ff Merge branch 'master' into bug1018 2015-05-28 10:18:12 +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 560eb61431 fixed bug 1447 by removing columns first, then inserting with index
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
2015-05-27 17:28:45 +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 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