 Nicolas
|
ebbc739c49
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-27 18:00:31 +02:00 |
|
|
Nicolas
|
98fcaa619c
|
Speeded up fixesAffectedByNewMarkFixes, got rid of endless loop.
|
2014-06-27 17:59:33 +02:00 |
|
|
Nicolas
|
9c7259504b
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-27 14:48:51 +02:00 |
|
|
Nicolas
|
35b7b495f7
|
Fix in chooser and finder.
|
2014-06-27 14:47:23 +02:00 |
|
|
Nicolas
|
0f20593ff9
|
Fixed some NPEs that occured during live use.
|
2014-06-27 11:39:59 +02:00 |
|
|
Nicolas
|
a4293746b5
|
Removing a RaceLog now notifies the MPC.
|
2014-06-27 09:53:28 +02:00 |
|
|
Nicolas
|
4b755b84df
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceLogListener.java
|
2014-06-27 09:28:07 +02:00 |
|
|
Nicolas
|
5f32d7bfe3
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-26 16:08:34 +02:00 |
|
|
Nicolas
|
a0381a8831
|
DynamicTrackedRaceLogListener now has its RaceLogs, enabling the Revoking
of fixed MarkPassings.
|
2014-06-26 14:32:39 +02:00 |
|
|
Nicolas
|
901808912a
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-26 14:12:16 +02:00 |
|
|
Nicolas
|
0b86d5ab22
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-26 12:30:16 +02:00 |
|
|
Nicolas
|
00c3a648b2
|
Finished racelog listening on MarkPassingUpdateListener.
|
2014-06-26 12:29:31 +02:00 |
|
|
Nicolas
|
c78ac4362f
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-26 10:47:48 +02:00 |
|
|
Nicolas
|
2c3093cf31
|
Changed the way fixed MarkPassings are passed through Calculator
infrastructure.
|
2014-06-25 12:02:51 +02:00 |
|
|
Nicolas
|
abcc0d2f8c
|
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
|
2014-06-25 10:39:28 +02:00 |
|
|
Nicolas
|
ea8988a3aa
|
Started adjustment of DynamicTrackedRaceLogListener.
|
2014-06-25 10:38:02 +02:00 |
|
|
Nicolas
|
7dd9870eae
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-19 12:20:26 +02:00 |
|
|
Nicolas
|
1f91d41ea7
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/KW470MarkPassingTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/OBMR2012VRMarkPassingTest.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
|
2014-06-17 13:51:39 +02:00 |
|
|
Nicolas
|
b72522dace
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-09 10:46:36 +02:00 |
|
|
Nicolas
|
7204d8081c
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-08 16:55:10 +02:00 |
|
|
Nicolas
|
2cc1912b4e
|
Implemented serialization for SuppressedMarkPassingsEvent too.
|
2014-06-08 16:16:31 +02:00 |
|
|
Nicolas
|
34a6accec1
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-08 14:01:06 +02:00 |
|
|
Nicolas
|
0677b6d41c
|
Renames.
|
2014-06-08 08:24:43 +02:00 |
|
|
Nicolas
|
08b68635a1
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-08 07:20:40 +02:00 |
|
|
Nicolas
|
207b685c0e
|
Enabled (de)serialization of FixedMarkPassingEvents.
|
2014-06-07 17:47:10 +02:00 |
|
|
Nicolas
|
af82ea42e6
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-07 10:52:15 +02:00 |
|
|
Nicolas
|
8e729a8d01
|
Adjusted tests.
|
2014-06-06 18:47:01 +02:00 |
|
|
Nicolas
|
0483b7d3e9
|
Added test for suppressing MarkPassings.
|
2014-06-06 08:34:07 +02:00 |
|
|
Nicolas
|
7d079f143c
|
Fixed Util.Pair
|
2014-06-05 21:41:15 +02:00 |
|
|
Nicolas
|
53b6c6d5b7
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/CandidateFinderTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingCalculatorPerformanceTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Course.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/AbstractCandidateChooser.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/AbstractCandidateFinder.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateChooser.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingCalculator.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingUpdateListener.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRace.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
|
2014-06-05 18:13:54 +02:00 |
|
|
Nicolas
|
c513a74c8a
|
Fixed failing tests and implemented suppressing waypoints in backend.
|
2014-06-05 18:04:23 +02:00 |
|
|
Nicolas
|
cd193d6049
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-02 19:07:59 +02:00 |
|
|
Nicolas
|
e14f43017b
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-02 16:03:18 +02:00 |
|
|
Nicolas
|
449af55676
|
Merge remote-tracking branch 'origin/mark-rounding-inference' into mark-rounding-inference
|
2014-06-01 14:10:02 +02:00 |
|
|
Nicolas
|
52d0d987aa
|
Fixed Waypoint addition outside of Finder and reworked
ChooserPerformanceTest.
|
2014-06-01 14:08:08 +02:00 |
|
|
Nicolas
|
3906a4180a
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-05-30 17:39:03 +02:00 |
|
|
Nicolas
|
bd97dec5ce
|
Created RaceLog Events for fixing and suppressing MarkPassings.
|
2014-05-30 16:42:59 +02:00 |
|
|
Nicolas
|
880d00f900
|
Merge remote-tracking branch 'origin/mark-rounding-inference' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.java
|
2014-05-28 15:19:48 +02:00 |
|
|
Nicolas
|
2a4db3156f
|
Fixed test failing because of merge and bad tractrac data.
|
2014-05-28 15:13:53 +02:00 |
|
|
Nicolas
|
df1614a12d
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.java
|
2014-05-27 16:24:37 +02:00 |
|
|
Nicolas
|
3ee3c00a14
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-05-15 01:12:13 +02:00 |
|
|
Nicolas
|
162094b6aa
|
Fixed WhiteBox tests.
|
2014-05-14 17:19:00 +02:00 |
|
|
Nicolas
|
6ac6a598fd
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-05-14 16:29:55 +02:00 |
|
|
Nicolas
|
789c3de7c9
|
Merge branch 'master' into mark-rounding-inference
|
2014-05-13 23:53:51 +02:00 |
|
|
Nicolas
|
c960081579
|
Reduced the number of races tested for markpassings to reduce build time.
|
2014-05-13 23:51:47 +02:00 |
|
|
Nicolas
|
9a6e9484a4
|
Implemented addition and removal of waypoints and created simple test.
|
2014-05-13 23:42:41 +02:00 |
|
|
Nicolas
|
98334fdcc6
|
Fixed merge issues.
|
2014-05-13 16:28:35 +02:00 |
|
|
Nicolas
|
70551ec1ed
|
Merge branch 'master' into mark-rounding-inference
|
2014-05-13 16:16:25 +02:00 |
|
|
Nicolas
|
390f23dddf
|
Finished caches, some problems merging.
|
2014-05-13 16:09:07 +02:00 |
|
|
Nicolas
|
69f3c5c460
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/Track.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.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
|
2014-05-13 15:53:28 +02:00 |
|
|
Nicolas
|
4437f96502
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-05-08 12:37:47 +02:00 |
|
|
Nicolas
|
b8182db8c8
|
Added a distance-cache insteead of saving all distances. Now only the last
10 fixes per competitor are cached.
|
2014-05-07 17:16:21 +02:00 |
|
|
Nicolas
|
6ac4e62f9b
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-05-07 14:59:28 +02:00 |
|
|
Nicolas
|
fd2de1d475
|
Fixed problems after merge and started adding and removal of waypoints.
|
2014-05-06 15:07:10 +02:00 |
|
|
Nicolas
|
fb7ddf870a
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-05-06 13:22:06 +02:00 |
|
|
Nicolas
|
9a5e4d5853
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/Candidate.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateChooser.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingCalculator.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingUpdateListener.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
|
2014-05-05 17:37:22 +02:00 |
|