Commit Graph
2672 Commits
Author SHA1 Message Date
Nick Klose 62cc37771c Merge remote-tracking branch 'origin/master' 2015-06-10 15:01:49 +02:00
Axel Uhl 37544c75dc more null safety; allow null durations in leg comparator for time-on-time ranking metric 2015-05-31 13:36:09 +02:00
Axel Uhl 429a1ace1d added more null safety and guarded against 0.0 VMG 2015-05-31 13:19:13 +02:00
Axel Uhl a581b24d60 Merge branch 'master' into bug1018 2015-05-30 11:06:24 +02:00
Axel Uhl f4a59060a6 Merge branch 'master' into bug2897 2015-05-30 07:31:23 +02:00
Axel Uhl 8f46585962 Merge branch 'master' into bug1018 2015-05-30 07:05:00 +02:00
Axel Uhl e13d2232a2 added MediaType enum literal case statements for image and unknown;
my impression is that so far, MediaType was primarily for video source identification, not for images; this may be a mismatch

Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaType.java
2015-05-30 07:03:07 +02:00
Axel Uhl 4365699ea6 Merge branch 'master' into bug1018
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	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_cn.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
2015-05-30 06:41:22 +02:00
Axel Uhl ecb4ac2ccb Merge remote-tracking branch 'server/master' 2015-05-30 06:37:44 +02:00
Axel Uhl 65776efe1d working towards a solution for bug 2923 by centralizing the fetching of competitors for the ranking metric; however, we don't have the leaderboard available where we need it 2015-05-29 18:30:26 +02:00
Axel Uhl d7a3fca6eb moved assertion where it belongs: don't compare windward distances when one competitor has already finished the leg;
the marks may move, hence giving different windward distances for different time points for the same leg
2015-05-29 17:54:56 +02:00
fmittag b642a882fa Merge remote-tracking branch 'origin/master' into design2015
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-05-29 18:30:33 +03:00
Axel Uhl d19b853152 fixed SailingGWT sdm.launch regarding regatta overview 2015-05-29 17:27:40 +02:00
Axel Uhl 8c411bf6e2 Merge branch 'master' into bug1018
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-05-29 16:51:59 +02:00
Axel Uhl 9aba87a8a8 Merge remote-tracking branch 'server/master' 2015-05-29 16:49:56 +02:00
Axel Uhl 3ffd736edf fixed case where a competitor was identified as farthest ahead but hasn't started a leg for which a comparator is requested 2015-05-29 15:22:35 +02:00
Axel Uhl 6a3c4e1bae added more null safety for unstarted races
Conflicts:
	mobile/github-advrecyclerview_lib/.settings/org.eclipse.jdt.core.prefs
2015-05-29 14:50:05 +02:00
Axel Uhl 3f354f6417 fixed column list, fixing RACE_CALCULATED_TIME_AT_ESTIMATED_ARRIVAL_AT_COMPETITOR_FARTHEST_AHEAD 2015-05-29 14:22:35 +02:00
Axel Uhl 0dbfaba524 fixed live time for getQuickRanks(); added several null checks for cases where competitors haven't started their legs yet 2015-05-29 14:17:58 +02:00
Axel Uhl 1a6663af45 Merge branch 'master' into bug1018 2015-05-29 13:17:18 +02:00
Axel Uhl c835c70275 fix attempt for bug 2922: deadlock due to TrackedRaceImpl.getMarkPassing locking the competitor mark passing collection;
the updateMarkPassing method locks competitor mark passings first, then the waypoint mark passings, while holding on to
the competitor mark passing collection's lock. Therefore, acquiring the competitor mark passing collection's lock is more
dangerous in "inner" methods that don't require more locks because callers may already hold on to the waypoint mark passing
lock, causing a deadlock with updateMarkPassing.
2015-05-29 13:16:12 +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 c9a43c5781 cache leg info about boat farthest ahead and calculate and cache the leader by calculated time for the leg in RankingInfo 2015-05-28 15:15:36 +02:00
Axel Uhl f11c534892 compute current VMG only if average VMG is not available 2015-05-28 14:33:09 +02:00
Axel Uhl e4e00fa228 turned competitorTracksOrderedByRank into a ConcurrentHashMap, avoiding synchronization 2015-05-28 14:32:35 +02:00
Frederik Petersen 18ec962a05 Merge both tacks in polar service 2015-05-28 14:24:32 +02:00
Axel Uhl 30a3b66c53 default time-on-time and time-on-distance values to 1.0 / 0.0, respectively, in BaseRegattaLinkImpl 2015-05-28 11:41:45 +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
Steffen Schaefer e07c585934 Merge remote-tracking branch 'origin/master' into design2015
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-05-28 09:55:11 +02:00
Axel Uhl 11fd9f907d getTrackedRaces() now also checks for write lock count 2015-05-28 00:23:02 +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 5d1322746a Merge branch 'master' into bug2897 2015-05-27 18:00:09 +02:00
Axel Uhl df3deb1a15 fixed bracing/indentation after cherry-picking commit 8cf239e31a 2015-05-27 17:59:22 +02:00
Axel Uhl 6a20efa1d9 fixing bug 2906: wind listeners didn't get de-registered proprely when removing a race and when re-starting the wind status servlet;
this should solve the problem with duplicate key exceptions hammering the DB

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/WaypointPositionAndDistanceCache.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/AbstractRankingMetric.java
2015-05-27 17:57:20 +02:00
Axel Uhl a6fa795f1f enhanced Javadoc and REST API doc for target time estimation 2015-05-27 17:29:07 +02:00
Axel Uhl 19c54b8076 started to work on bug 1447 by adding Series.addRaceColumn flavor that accepts an insert index
Conflicts:
	java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
2015-05-27 17:28:14 +02:00
Axel Uhl 6830d26571 use NamedReentrantReadWriteLock for accessing LeaderboardGroup.leaderboards collection; works towards solving bug 2897 2015-05-27 16:52:44 +02:00
Papick Garcia Taboada 1e0f861344 Introduced fullscreen viewer for home, moved necessary media classes to sse 2015-05-26 17:09:52 +02:00
Axel Uhl c0e55a5b56 added Javadoc to TrackedRace 2015-05-21 16:05:02 +02:00
Axel Uhl 6304504e3c added column for correctedTimeAtEstimatedArrivalAtCompetitorFarthestAhead (see bug 2862) 2015-05-21 12:58:46 +02:00
Axel Uhl 51f7f9f0c4 one more usage of WindLegTypeAndLegBearingCache 2015-05-21 12:57:17 +02:00
Axel Uhl d3073529ff fixed gap change in own time, making a distinction between first and other legs 2015-05-21 08:39:02 +02:00
Axel Uhl 378d5f48cb fixing severe bug in time traveled on TrackedLegOfCompetitorImpl; the column kept counting, even after leg finishing time 2015-05-20 23:34:15 +02:00
Axel Uhl f7d72e7ab3 added corrected time columns (see bug 2862) 2015-05-20 22:45:42 +02:00
Axel Uhl 9bc3fddebc avoid reducing windward distance traveled in case a competitor is at the mark rounding and has a negative windward distance traveled for the current leg 2015-05-20 18:03:58 +02:00
Axel Uhl 2d11ab9a31 fixed calculation bug in TimeOnTimeAndDistanceRankingMetric 2015-05-20 17:50:17 +02:00
Axel Uhl cf09647e00 fixed issues with competitors who didn't start a leg yet; added toString() for TrackedLeg and TrackedLegOfCompetitor 2015-05-20 17:07:05 +02:00
Axel Uhl 96988ae292 an untested attempt to compute the gap to leader for a leg for TimeOnTimeAndDistanceRankingMetric; still square effort; extraction of pre-calculation still missing 2015-05-20 16:13:09 +02:00