Commit Graph
35203 Commits
Author SHA1 Message Date
Axel Uhl 4c0dbe3778 fixed tests' use of trackedLeg.getEstimatedTimeToComplete
Change-Id: Ic8b6444b4f934c5a1c741a90cecc3b0ac788e34a
2016-09-29 17:01:16 +02:00
Axel Uhl a2fdddcd83 Merge branch 'master' into bug3932 2016-09-29 16:58:50 +02:00
Axel Uhl 2eadc62a86 Merge remote-tracking branch 'server/master' 2016-09-29 16:57:50 +02:00
Axel Uhl 5163dd65f2 fixing bug 3935 by adding a simple null check
Change-Id: I2c511d794c4947384f2be9b5072cc601ceb00f90
2016-09-29 16:56:14 +02:00
Axel Uhl db5f3201b9 use MarkPositionCacheAtTimePoint also for target time estimation
Change-Id: Ia496ea6eeac44cb8adde7de5d065a5b155c56c0f
2016-09-29 16:55:49 +02:00
Axel Uhl ceb4805693 consolidated imports to avoid warnings
Change-Id: I9aecb7fa9001f8088d1ab380366e192d407ccd53
2016-09-29 16:39:28 +02:00
Axel Uhl 2e686866ff fixed more tests by mocking both variants of getApproximatePosition
Change-Id: I51bacd50a7b7863fbd9374b90267d641b1717333
2016-09-29 16:37:45 +02:00
Axel Uhl 804bd605b4 fixing test set-up which now also has to mock the new TrackedRace.getApproximatePosition overload
Change-Id: I40926b8776db0684175e914c6450030fbac2bf6e
2016-09-29 16:17:11 +02:00
Axel Uhl a5f2fb7591 implemented caching for mark positions throughout essential call trees relevant for mark passing calculations; see bug 3932
Change-Id: I1a6384473332efc4735b0ec70b0907ec45ef4e71
2016-09-29 16:13:30 +02:00
Adrian Riedel 209d6d9ff9 Merge branch 'bug3925' 2016-09-29 15:50:57 +02:00
Adrian Riedel 5d7d4f8079 Merge branch 'bug3912' 2016-09-29 15:49:59 +02:00
Adrian Riedel a69b2542d6 Merge branch 'bug3911' 2016-09-29 15:49:49 +02:00
Daniel Wagner 47a612985d Updated data consumption (markdown) 2016-09-29 13:32:46 +00:00
Axel Uhl 37067f73d7 whitespace and comment changes only
Change-Id: Iee3d59674afa1aa4fa3be98afcbf0bedf54e21ea
2016-09-29 14:26:27 +02:00
Axel Uhl b555cbebd8 fire gpsFixReceived on listener only if the fix was really added to the track
Change-Id: I6eeb248e43a77c771ca1fac124195cbacadd1b4d
2016-09-29 13:58:14 +02:00
Axel Uhl 71ac387703 obtain lock before try block
Change-Id: Ia16d31d4ec82ed9a37c7c6fd6634e8918af1b2b9
2016-09-29 13:57:38 +02:00
Axel Uhl 753d5d8b14 fixed CandidateFinderImpl.getCandidateDeltasAfterRaceStartTimeChange, now using the old and the new time range value correctly
Change-Id: I54ff9359b44ab708ff75f0e577f00c560da2d0f3
2016-09-29 11:55:37 +02:00
Axel Uhl 87185c7ef6 avoid redundant calls to updateStartAndEndOfTracking after automatically adding start/end of tracking events to the race log
Change-Id: Id8e8af1c8c124ad8a7ad16bf2eb45124da4ecbd5
2016-09-29 11:41:06 +02:00
Axel Uhl 2cea4720f7 most likely a fix for bug 3932: FixLoaderAndTracker.loadFixes didn't honor the timeRangeToLoad for competitor and mark tracks
Change-Id: I50b1fc88d1a4091924507f5aaa2851c38de5e26d
2016-09-29 11:14:07 +02:00
Axel Uhl 80e5dba10a fixed language issues in Javadoc comment
Change-Id: I768672ec25e730598ec513266ab50b61be1321e6
2016-09-29 10:30:53 +02:00
Axel Uhl 186fdfb47b removed unused constant
Change-Id: I561c2f493ce816624e02cd411ad2e2538a9ad6c1
2016-09-29 10:30:23 +02:00
Axel Uhl 994973ac3b Merge branch 'ubilabs--ios--develop' 2016-09-29 09:35:53 +02:00
Adrian Riedel 46fea25b8f marked new key and number strings as non-translatable accordingly 2016-09-29 09:31:59 +02:00
Axel Uhl c01daef9b9 Merge branch 'bug3928' 2016-09-28 17:59:54 +02:00
Axel Uhl ed7385a487 when log level is FINE for the com.sap.sse.util.impl package or the thread pool utility classes, log information about long-running tasks
Change-Id: I5c9c75b4225c396c234a1a9720368ef4dc8e0b95
2016-09-28 17:55:59 +02:00
Axel Uhl 65790122d3 better toString support for improved log messages
Change-Id: I00fd950667bb7597ab7972cc76480234b15d00d1
2016-09-28 17:55:32 +02:00
Axel Uhl 0d257b3f9e made updateStartAndEndOfTrackingMonitor a non-empty string for better readability in the debugger
Change-Id: I6eee46b28f14b9530d331a3778e1d776cf46593a
2016-09-28 17:55:00 +02:00
Axel Uhl b4f49f629f using single-point-of-exit pattern in CandidateFinderIMpl
Change-Id: I959937d6c4ddd5d2745f03132ffaa369cec4354b
2016-09-28 17:54:34 +02:00
Axel Uhl 7e3981c524 improved toString output of Callable injected into executor in MarkPassingCalculator so we can see something in the log
Change-Id: I2e1dee425cc18b39cb80e65049302dc4abea65df
2016-09-28 17:53:56 +02:00
Axel Uhl 882d40dd56 improved Waypoint.toString by adding passing instructions
Change-Id: I93cd6cf9351f7e68b868b32805ad7266ebf0c2f4
2016-09-28 17:53:28 +02:00
Steffen Schaefer 0ab64a06e3 Added try/finally to ensure that unlock is correctly called if an
exception is thrown by TrackedRace.setStatusAndProgress
2016-09-28 16:00:04 +02:00
Adrian Riedel da2cb52224 Merge branch 'bug3925' of ssh://localhost:12349/home/trac/git into bug3925 2016-09-28 14:57:40 +02:00
Adrian Riedel bbcaea3fa9 TRACKING APP: added a text summarizing the current GPS update interval status; implemented automatic energy saving mode compliant with new setting (which can also be overwritten) and removed the old manual switch 2016-09-28 14:14:56 +02:00
Axel Uhl 01ecf870d6 log exceptions that occur during computeMarkPasses
Change-Id: I4ba66b04a11eeb5ad0b8fe9f18ad1e1d51c2b07b
2016-09-28 13:33:55 +02:00
Adrian Riedel 72463bc793 Updated energy consumption (markdown) 2016-09-28 11:07:09 +00:00
Adrian Riedel 86dcf03b9a Updated energy consumption (markdown) 2016-09-28 11:07:08 +00:00
Axel Uhl cf0b1ac729 fixed reloadAndGetPreviousRacesByRace again, returning an entry for all TrackedRaces
Change-Id: Ic9f61ada782acb53f579832d84eddf90f4c52963
2016-09-28 12:38:38 +02:00
Axel Uhl 8e0d1aca46 use lock propagation/inheritance to avoid read-read deadlocks in CandidateFinderImpl.invalidateAfterCourseChange when calling invokeAll
Change-Id: I3be9970bf4d85a61a083cac45f37a6ec4b1e0640
2016-09-28 11:19:50 +02:00
Axel Uhl d3bd358262 left a FIXME comment for bug3928 in CandidateFinderImpl regarding the long holding of the course read lock while waiting for background thread pool tasks to complete
Change-Id: I0d00bc2d427c826d3bd080a6fe69262fe2fbeb33
2016-09-28 11:08:29 +02:00
Daniel Wagner 5b6035cfb3 Updated energy consumption (markdown) 2016-09-28 08:37:00 +00:00
Daniel Wagner 9eca83ff07 modified energy consumption wiki page, images are now clickable 2016-09-28 10:28:49 +02:00
Daniel Wagner e569d2e24b Updated energy consumption (markdown) 2016-09-28 08:13:42 +00:00
Daniel Wagner 057610c059 added energy consumption wiki page, renamed data consumption wiki page 2016-09-28 10:01:04 +02:00
Axel Uhl 162267bddc moved lockForRead() calls before the try block
Change-Id: Ia45d579c9c9dc9a29f5dff8b208b07ca846bbf88
2016-09-28 09:43:16 +02:00
Axel Uhl 31cccdcdb6 trace the right Future object
Change-Id: Ie1e99e2139a37580d4e0b07d3a0c0592bfec4aaf
2016-09-28 09:42:59 +02:00
Axel Uhl 4c39ed417a fixed logging the right Future object
Change-Id: I3f599dc68e7171aa065b6393369087f480ff37a5
2016-09-28 09:42:26 +02:00
Axel Uhl 3703571a15 simplified code by using Util.addToValueSet
Change-Id: I942ab74cbd46988fde8e5f6ca53aa466050f1a7c
2016-09-28 09:41:48 +02:00
Axel Uhl 7c6ce2960b improved Future.get() timeout tracing; use a default foreground thread pool size twice the regular size
Change-Id: I8e8281c459354542006c253410b826a2b11e8b05
2016-09-28 00:54:57 +02:00
Axel Uhl e9d92d3593 improved Future.get() trace message, indicating that a re-try will happen
Change-Id: Id81c4f40a18e1f8290af3bccbb1b399b6e35bd01
2016-09-27 18:32:17 +02:00
Axel Uhl ca14fe33f6 tracing for Future.get
Change-Id: I5c0bf627c86eef180889fa769e7952de2a27afdd
2016-09-27 17:17:33 +02:00