Commit Graph
100 Commits
Author SHA1 Message Date
Nick ae293ee37a Distance and XTE Caches ind CandidateFinder now clear when new mark fixes requirw it. 2016-03-25 16:37:39 +01:00
Nick b99eb87d64 Merge remote-tracking branch 'origin/mark-passing-probability' into mark-passing-probability
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateWithSide.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/DistanceCandidateImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/XTECandidateImpl.java
2016-03-21 01:11:57 +01:00
Nick 86a53c95eb Merge remote-tracking branch 'origin/master' into mark-passing-probability 2016-03-15 21:48:47 +01:00
Nick 1561cd99e2 Adjeusted calculation of WrongSidePenalty in CandidateFinder to have a soft transition from being on the right side to getting a penalty on the wrong side depending on the distance to the waypoint. 2016-03-15 21:47:35 +01:00
Nick 4c0f2fd2cf Merge remote-tracking branch 'origin/mark-passing-probability' into mark-passing-probability 2016-03-14 15:36:09 +01:00
Nick 3029320d5b Merge remote-tracking branch 'origin/mark-passing-probability' into mark-passing-probability 2016-03-14 14:10:12 +01:00
Nick f2079d2d30 Merge remote-tracking branch 'origin/master' 2016-03-07 15:54:14 +01:00
Nick 786ec5d425 Merge remote-tracking branch 'origin/master' into mark-passing-probability 2016-03-07 15:53:52 +01:00
Nick 713c35dd3a Changed JavaDocs. 2016-03-07 15:52:17 +01:00
Nick 48170780a1 Switched mark passing algorithm to use probabilities instead of costs. 2016-03-07 11:04:12 +01:00
Nick 8ddb8fc1a2 Merge remote-tracking branch 'origin/master' 2016-03-06 17:50:32 +01:00
Nick aa1641c589 Merge remote-tracking branch 'origin/master' 2016-03-04 13:50:59 +01:00
Nick 61dcfc31e5 Merge remote-tracking branch 'origin/master' 2016-02-28 14:50:57 +01:00
Nick b966cf25bb Merge remote-tracking branch 'origin/master' 2016-01-20 11:53:11 +01:00
Nick 0c33f7ea22 Fixed problem, where the first or last waypoint not being a Line caused the MPC to crash. 2016-01-20 11:50:42 +01:00
Nick 61bc304d9d TrackingTimes will be read out of RaceLog when connected to a TrackedRaces 2015-08-08 14:24:31 +02:00
Nick ee2777dcd6 TrackingTimes dialog handles unchanged times correctly. 2015-08-08 12:06:05 +02:00
Nick caf8a47fd9 Merge remote-tracking branch 'origin/tracking-times' into tracking-times 2015-08-07 14:06:15 +02:00
Nick 6e294577c3 Unchanged tracking times will not result in extra (identical) RaceLog events when editing tracking times. 2015-08-07 14:04:04 +02:00
Nick 29b84ef844 Merge remote-tracking branch 'origin/master' into tracking-times 2015-08-07 12:19:12 +02:00
Nick 476f70d394 Merge remote-tracking branch 'origin/master' into tracking-times 2015-07-29 12:05:48 +02:00
Nick 22c70038b9 Merge remote-tracking branch 'origin/master' 2015-07-24 19:56:16 +02:00
Nick 5605f4a763 Added KZV as alternative for Kielzugvogel in BoatClassMasterdata 2015-07-24 19:55:51 +02:00
Nick 8ef9663efc Made Leaderboard list in AdminConsole sortable in all columns 2015-07-23 10:51:17 +02:00
Nick f3b3e5646b Made all columns in RegattaOverview sortable. 2015-07-21 15:01:02 +02:00
Nick 889370e14f Merge remote-tracking branch 'origin/master' into tracking-times
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.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_ru.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2015-07-20 21:04:46 +02:00
Nick d17a82945b AbstractMarkPassingTest waits for race to load before testing 2015-07-19 08:14:19 +02:00
Nick 79ae7b8530 Merge remote-tracking branch 'origin/master' 2015-07-18 18:13:56 +02:00
Nick 1cb3c637d8 Added short info to TrackingTime RaceLog events to view in AdminConsole. 2015-07-18 18:13:09 +02:00
Nick d519c24cd4 Merge branch 'master' into tracking-times 2015-07-17 11:41:31 +02:00
Nick 5397278e68 Opening the EditMarkPassingsPanel checks the CompetitorSelection and updates accordingly. 2015-07-17 11:35:40 +02:00
Nick 81d834b75f Merge remote-tracking branch 'origin/master' into tracking-times
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
2015-07-17 10:29:58 +02:00
Nick 74b76f2b75 Merge remote-tracking branch 'origin/master' 2015-07-06 18:50:49 +02:00
Nick 23450c3173 EditMarkPassingsPanel offers a hint if no or multiple competitors are selected. 2015-07-06 18:47:59 +02:00
Nick 5c1f9b6424 Merge remote-tracking branch 'origin/master' 2015-07-06 17:47:04 +02:00
Nick 7dec49d1f2 EditMarkPassingsPanel only requests competitor information if the panel is visible, thus reducing server calls 2015-07-06 17:46:01 +02:00
Nick 966dd5c955 Merge remote-tracking branch 'origin/master' 2015-07-06 16:49:04 +02:00
Nick ef0c358b02 Removed method accidentally added to SailingServiceImpl before being fully implemented. 2015-07-06 16:46:29 +02:00
Nick 5a3ba9b466 Added button to set tracking times in the RaceLog. Does not harmonize with TracTrac times yet. 2015-07-06 13:55:21 +02:00
Nick 15fe949b4b Merge remote-tracking branch 'origin/master' 2015-07-04 21:16:46 +02:00
Nick b2c9a44a57 Added RaceLogEvents for End and Start of tracking. Renamed unconsistent RaceLogEvents for MarkPassing editing. 2015-06-28 09:46:21 +02:00
Nick 49debd7d8a Merge branch 'mark-rounding-inference' 2015-06-27 14:25:04 +02:00
Nick c5a4a5a074 Merge remote-tracking branch 'origin/master' 2015-06-27 14:24:55 +02:00
Nick 6fcc6181b3 Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-06-27 14:24:34 +02:00
Nick 59301fa710 Fixed concurrency issue in CandidateFinder 2015-06-27 14:24:12 +02:00
Nick 543e53edf5 Merge remote-tracking branch 'origin/master' 2015-06-27 08:56:15 +02:00
Nick be73dafdf1 Merge remote-tracking branch 'origin/master' 2015-06-26 13:20:48 +02:00
Nick cc9794655c Merge remote-tracking branch 'origin/master'
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingCalculator.java
2015-06-26 10:03:15 +02:00
Nick d06f9c3973 Edited JavaDoc of MPC 2015-06-26 09:54:29 +02:00
Nick Klose 62cc37771c Merge remote-tracking branch 'origin/master' 2015-06-10 15:01:49 +02:00
Nick Klose e00966cb69 Fixed JavaDoc in CandidateFinder 2015-05-18 23:57:26 +02:00
Nick Klose 4fb3846b84 Added english mark passing strings to russian file. 2015-02-11 21:28:39 +01:00
Nicolas 6113e6b0c2 Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-02-11 21:10:18 +01:00
Nick Klose f68de40f8e Added mark passing related string messages(w/o russian translation) 2015-02-11 20:29:23 +01:00
Nicolas 7e3aab3a33 Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	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
2015-02-11 17:58:59 +01:00
Nicolas 081a32ce1e Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-02-07 17:38:10 +01:00
Nick Klose 798888d472 Fixed problem parsing data because PassingInstructions from TracTrac can be one- or zero-based 2015-02-07 17:36:56 +01:00
Nick Klose 9f35a3d1c9 Inserted check that converts the PassingInstruction of the first and last waypoint from Gate to Line 2015-02-07 17:09:29 +01:00
Nicolas 5406e91d28 Changed title of suppressing button. 2015-02-07 01:22:09 +01:00
Nicolas 9598f4d529 Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-02-06 23:20:18 +01:00
Nicolas 9ecbc9c78c Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-02-06 14:45:01 +01:00
Nicolas cb3043cebc Merge remote-tracking branch 'origin/mark-rounding-inference' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
2015-02-06 14:44:47 +01:00
Nick Klose 8b108dc816 Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-02-05 16:15:09 +01:00
Nicolas ba1f3fd0cd Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
2015-02-05 16:10:40 +01:00
Nicolas 71a0c68499 Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	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
2015-02-04 17:38:16 +01:00
Nicolas 4b1115e81a Merge remote-tracking branch 'origin/mark-rounding-inference' into mark-rounding-inference 2015-01-31 16:00:36 +01:00
Nicolas 218cdef749 Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-01-31 16:00:11 +01:00
Nicolas 456faa0fbe Fixed dissapearing mark passings panel when competitor selection changes. 2015-01-27 15:27:25 +01:00
Nicolas 09475cdd88 Fixed button enabling in EditMarkPassingsPanel. 2015-01-27 03:43:45 +01:00
Nicolas 9bdcabdd41 Fixed opening and closing of EditMarkPassingsPanel. 2015-01-26 18:18:33 +01:00
Nick Klose 719c2d8b57 Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-01-26 15:49:18 +01:00
Nicolas 5342726e48 Merge remote-tracking branch 'origin/mark-rounding-inference' into mark-rounding-inference 2015-01-24 16:34:22 +01:00
Nicolas 5f6935d621 Merge remote-tracking branch 'origin/mark-rounding-inference' into mark-rounding-inference 2015-01-24 16:33:37 +01:00
Nicolas 6402631c8f Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-01-24 16:33:26 +01:00
Nick Klose 5a00d5d376 Fixed format in TracTrac.java 2015-01-24 16:12:45 +01:00
Nick Klose fd8f612055 Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-01-24 14:27:23 +01:00
Nicolas a6f0206f0d Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
2015-01-23 16:12:17 +01:00
Nick Klose 2a03506c9d EditMarkPassingsPanel now vanishes if User changes 2015-01-21 17:54:13 +01:00
Nick Klose b3ff02e02a Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-01-20 17:54:58 +01:00
Nicolas 50b0c877b5 Moved (De)Serializers for MarkPassingEvents. 2015-01-18 20:06:51 +01:00
Nick Klose 31e9d0a5a3 Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-01-18 19:39:25 +01:00
Nick Klose 559b9eeeca Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-01-14 18:04:26 +01:00
Nick Klose a776488c7c Improved logging in MPC 2015-01-14 16:57:45 +01:00
Nicolas 2b16f75951 Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-01-14 15:00:44 +01:00
Nicolas c75b5d8f7b Added UserRole check in RaceBoardPanel. 2015-01-14 14:59:40 +01:00
Nicolas 529d1e967d Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-01-14 14:23:37 +01:00
Nick Klose 8c3b9e4cae Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-01-09 18:43:14 +01:00
Nicolas d73651f469 Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
2015-01-09 16:19:09 +01:00
Nicolas cd748fa12b Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.autoload/src/com/sap/sailing/autoload/TracTrac.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreVisitor.java
	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventVisitor.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/AbstractRaceLogChangedVisitor.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/BaseRaceLogEventVisitor.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventFactoryImpl.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.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/mock/MockedTrackedRace.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/TracTracAdapter.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracAdapterImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RaceColumnRaceLogReplicator.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/ui/client/SailingService.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/raceboard/RaceBoardPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
2015-01-08 05:27:20 +01:00
Nicolas 639a8926af Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.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
2014-12-14 17:01:29 +01:00
Nicolas ee3f1afa10 Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2014-12-12 16:36:55 +01:00
Nicolas 55ec0b3c67 Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2014-12-12 13:17:37 +01:00
Nicolas a99b5c39cc Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2014-12-11 23:11:37 +01:00
Nicolas 4cbb250258 Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2014-12-11 23:04:04 +01:00
Nicolas 5aa35a898e Removed user handling. 2014-12-11 23:03:21 +01:00
Nicolas ef20b1c82e Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2014-12-11 20:30:53 +01:00
Nicolas 9b0fe47ee3 Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRegatta.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.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/server/SailingServiceImpl.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2014-12-11 19:59:45 +01:00
Nicolas 5782d09d2a Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
2014-12-10 16:34:23 +01:00
Nicolas 4bcb5d84b1 Added role check in EditMarkPassingsPanel and removed from
LeaderboardPanel.
2014-12-06 13:58:53 +01:00
Nicolas a467db26c8 Fixed NullPointer. 2014-12-06 13:21:57 +01:00