Commit Graph
3126 Commits
Author SHA1 Message Date
Axel Uhl 6f1fca66f4 Merge remote branch 'origin/mark-passing-probability' 2016-03-27 19:22:55 +02:00
Nick ae293ee37a Distance and XTE Caches ind CandidateFinder now clear when new mark fixes requirw it. 2016-03-25 16:37:39 +01:00
Axel Uhl a2307d856c Merge branch 'bug3535' into bug2840 2016-03-24 15:34:40 +01:00
Axel Uhl d4532e111e make sure that GPSFixTrackImpl.add logic is called whenever a fix is added; this was shortcut by overrides in subclasses
Change-Id: Ib6482ec4a3993b68de554f25e9187e8e4575a122
2016-03-24 14:34:48 +01:00
Axel Uhl 11a7e371db Merge branch 'bug3535' into bug2840 2016-03-23 17:46:10 +01:00
Axel Uhl c1bda954b8 use add(fix, replace=true) for addGPSFix on the GPSFixTrack implementation classes, having new fixes with equal time point replace previous ones
Change-Id: I970c51e46d451c73040c1be9dd77168dc12f11a5
2016-03-23 17:41:18 +01:00
Axel Uhl c90f36cccc offer add(fix, replace) on Track to allow optional replacement of fixes in a track
Change-Id: I312a8693f04440f529412f048bfdccd34c404109
2016-03-23 17:38:14 +01:00
Axel Uhl 0a074cb733 "amending" commit b59db4943d, adding the two classes that use the changed protocol of CompetitorDeregistrator
Change-Id: I50d58d556396d1dfbb9d53aaf3bb726ebdccd05f
2016-03-23 15:52:32 +01:00
Axel Uhl 329d46769c Merge branch 'master' into bug2840
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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
	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/raceboard/RaceBoardPanel.java

Change-Id: I9cca175d1e3dd3876235c15ccef388f4a9ef0e98
2016-03-22 14:54:47 +01:00
Axel Uhl 41ce0c5430 started implementing the mark position-related services in SailingServiceImpl
Change-Id: I37d1eaa1b04e40948bbeeaa1b845c995de60b4c6
2016-03-22 14:40:25 +01:00
Axel Uhl 223bbc6e1e irestricted access to method required by test to protected and subclasses in test case
Change-Id: I51267c918712a71ff64334bfbacfa9cfd0bfc7c1
2016-03-21 18:21:02 +01:00
Axel Uhl 3571681f48 made method required by test class public
Change-Id: I7193d193e35990f0655c8136d32f5d4807e781f3
2016-03-21 18:17:06 +01:00
Axel Uhl 3d934b3450 started an implementation of the mark position editing services in SailingServiceImpl
Change-Id: Ibc6954ae4b4b2810d18d2ae892f658e463612314
2016-03-21 18:10:45 +01:00
Axel Uhl 37a1525975 made inner class of CandidateFinderImpl public to let Maven-based tests see it
Change-Id: Ia977d5d01f53482c1cc9d12aec7745e69c6ab8ac
2016-03-21 10:24:25 +01:00
Axel Uhl 50426f0aee uncommented timeout rule again; some formatting/whitespace changes
Change-Id: Iedafb8307e80d73d300eaca82b7d4bbfd546ad98
2016-03-21 10:21:00 +01:00
Axel Uhl eaf66a9c91 Merge remote-tracking branch 'server/mark-passing-probability' into mark-passing-probability
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImpl.java

Change-Id: I1428b1e7d0dd1f1a0ef4a25fc16b87e89140811c
2016-03-21 10:00:32 +01:00
Axel Uhl 57eee82a63 use existing inference of passing instructions that it used elsewhere
Change-Id: I061d67f90fb6ec770b19b765dc787340a3f882da
2016-03-21 09:59:55 +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
Axel Uhl 203ec84696 assume start being a line if PassingInstructions are None
Change-Id: Icd42b210fc97eddfc5a6574dd51966bd4c5e7e03
2016-03-19 23:03:56 +01:00
Axel Uhl 9f6a38ec7a use two probabilities for start mark passings: one based on start line proximity, one based on variance of distance from start line
Change-Id: I2d25867c2b78c242e5dc007b255300d54175725e
2016-03-19 22:44:56 +01:00
Axel Uhl ab5c097c35 use numeric verdict for direction detection to enable worse penalty for passing lines the wrong way
Change-Id: I66d36b5496e28c83d453fe8d5fc7af1ee58f7e36
2016-03-19 14:18:41 +01:00
Axel Uhl 655535a263 use end candidate for edge probability, not start candidate
Change-Id: Ia7ff04b7e31222c1bd23b400134f863101d1458a
2016-03-19 14:18:13 +01:00
Axel Uhl 474d798057 made the penalty for distance candidates worse
Change-Id: Ic801c94527b2a94be8923c717c19d066ba172565
2016-03-17 23:46:13 +01:00
Axel Uhl 51c392ba7e use only start candidate's probability for the Edge probability, avoiding the candidate probabilities getting squared
Change-Id: Ib475671ecce3f013abe266a26bf4bb1e18fba275
2016-03-17 21:57:58 +01:00
Axel Uhl 8f59104ee2 increased the skip penalty factors (effectively reducing the penalties); first OBMR tests green now...
Change-Id: I595181391a2b2275b429e06b8e54953099d57992
2016-03-17 14:27:18 +01:00
Axel Uhl 44881718b9 fixed MINIMUM_PROBABILITY which now already *is* a probability after changing the penalties to probability-based penalties
Change-Id: I378795db0691a365029ca8daa4ac6b2a3dd69c26
2016-03-17 14:20:26 +01:00
Axel Uhl b3e55135fd Merge branch 'master' into mark-passing-probability 2016-03-17 13:55:20 +01:00
Axel Uhl 1d5221fbaf fixed minor issue in createOrUpdateFinishMarkPassingIfRequired related to reverting finish mark passings from race log
Change-Id: I8ab959c5b927e1a6e1925a17eab50cdf17b453d2
2016-03-17 10:54:46 +01:00
Axel Uhl c4a73c6a89 comment and whitespace changes only
Change-Id: I51627bfb8c251b4377bc4b3952b841f72ce321cf
2016-03-16 18:26:57 +01:00
Axel Uhl 864f91b6e0 max probability for 0..1 hull length average distance to start line
Change-Id: I41b5d4c338fcaa0a323ad75024e92910a715ef61
2016-03-16 18:07:05 +01:00
Axel Uhl 3c856f0cc7 trying a logarithmic measure to weigh outliers less than closeby candidates
Change-Id: I1b0ed6f11f44726c3353641c839090dd0f16df1c
2016-03-16 15:14:23 +01:00
Axel Uhl 5dd983012c introduced a first metric for start waypoint candidate assessment based on other competitors' distance to start waypoint
Change-Id: Idedffd89173d535aab65e706e217ec3446cf0c25
2016-03-16 13:44:44 +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
Axel Uhl af3a01ef91 Merge branch 'master' into mark-passing-probability 2016-03-15 09:46:41 +01:00
Axel Uhl 12f9177e50 started to implement a start mark passing candidate evaluation based on the other competitors' distance to the start line at that time point
Change-Id: Ie7eba729648041c26cce9378a3b5fc3a11f8d2dd
2016-03-14 18:30:30 +01:00
Axel Uhl dc08833b46 don't apply penalty for wrong side if side is undefined; introduced PassingInstruction.Single_Unknown for this purpose
Change-Id: I0502b41df0ce409621c7da9c7d8dca0036e56cdd
2016-03-14 16:39:24 +01:00
Axel Uhl 05d5eebc66 Bug 3521: implement cleaner separation between RaceColumn.getAvailableMarks() and .getCourseMarks()
Change-Id: Ie6e2453388c625ee68a8c1591fef6dd2f76d1d64
2016-03-14 14:22:10 +01:00
Axel Uhl e6b9a38e0c introduced CandidateImpl subclasses for specific debug output for XTE and distance candidates
Change-Id: Ie4fd37424ae2d58d6f2e3fa209ba4ab51d3ae64c
2016-03-11 09:39:12 +01:00
Axel Uhl 2e61bd8b2c use start time without inference from start mark passings
Change-Id: I375139fe8763961db17eb783fd1e403e43079734
2016-03-10 00:21:02 +01:00
Axel Uhl 402b29a105 Merge branch 'master' into mark-passing-probability 2016-03-09 18:13:38 +01:00
Axel Uhl df5c695c35 exclude windSourcesToExclude in addition to TRACK_BASED_ESTIMATION when computing wind on leg (TrackedLegImpl.getWindOnLeg);
while on the COMBINED wind excluding a wind source had the effect desired, it wasn't possible to affect the leg type by
excluding a wind source.

Change-Id: I236aec9a9d740e153288dc3f80bd0a50302ff627
2016-03-09 14:57:00 +01:00
Axel Uhl c53fd2d44e Merge branch 'master' into mark-passing-probability 2016-03-08 22:22:25 +01:00
Axel Uhl 6725252aed using uppercase constant names for tuning mark passing algorithm
Change-Id: Icd557ad66865c6b7548b575bd7daf306e209b1ca
2016-03-08 21:45:18 +01:00
Axel Uhl 2878bb2309 be more tolerant on shorter actual distances sailed: use the ratio as probability below 1.0, making this a continuous function
Change-Id: I5a376d4ea3399b753bd1e491450859e1280b2c3e
2016-03-08 21:43:55 +01:00
Jan Broß 52af52e897 Merge branch 'jbross-poor-mans-wizard' 2016-03-08 09:30:05 +01:00
Axel Uhl 1c56590b9b TrackedRace: distinguishing between start time determined with or without inference from start mark passings;
this allows us to use only start times *without* start mark passing inference in the mark passing calculator
which otherwise would lead to a conceptual recursion where mark passings may be excluded because other mark
passings have previously been inferred at a later point, suggesting a later start, ruling out earlier start
mark passings.

Change-Id: I9b5a530e388bfbc3e0fb91845ec892f288d403bd
2016-03-08 01:28:42 +01:00
Axel Uhl bc9f3fcc9f the CandidateFinderImpl.penaltyForSkipping needed to acknowledge that Edge.getPenaltyForSkipping() now is probability-based
Change-Id: I1f969fc6a0cbc8581cfa9a7268fe6a8f4a3e26b6
2016-03-08 00:20:30 +01:00
Axel Uhl b70fdf86dc extending the grace with which start mark passing offset from start time is handled
Change-Id: I8e88ac4ce0a8bc320a02344f296cba08c691abaa
2016-03-07 22:57:40 +01:00
Axel Uhl e8e6f427fb properly initializing CandidateChooserImpl's currentMarkPasses map now lets the tests fail for proper reasons
Change-Id: I90e6eacfef0cf30cf050004eaa04619c3b6d0128
2016-03-07 22:45:42 +01:00