Commit Graph
1647 Commits
Author SHA1 Message Date
Axel Uhl f0bd78abd6 Merge branch 'master' into racecommittee_app
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/LeaderboardEditing.gwt.xml
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2014-01-27 17:21:33 +01:00
Simon Pamies 893ba574bf During the start phase of a race it can happen that the timepoint of the
mark passing can be null although the mark passing object itself is
valid. Making sure to avoid NPE in this case.
2014-01-24 12:30:21 +01:00
Frederik Petersen b6cdeae717 Merge branch 'master' into masterdataimport-bug1708 2014-01-24 10:31:20 +01:00
Axel Uhl c75c24535d Merge remote-tracking branch 'server/master' into racecommittee_app 2014-01-24 09:04:39 +01:00
Simon Pamies fb31e6fda5 Removed GetStartAdvantage 2014-01-23 23:14:16 +01:00
Simon Pamies 7e6223d82e Added logging about wind loading times and number of wind tracks 2014-01-23 16:33:32 +01:00
Frederik Petersen d89b19e1d3 Merge branch 'master' into masterdataimport-bug1708 2014-01-23 16:32:59 +01:00
Frederik Petersen ed6d224a1c Carried points, score corrections, suppressed competitors
are all imported even if no corresponding race is loaded on
the exporting side.

also fixed competitor id serialization
2014-01-23 16:10:00 +01:00
Axel Uhl 394c02b3a4 Merge branch 'master' into racecommittee_app 2014-01-23 12:45:43 +01:00
Lennart Hensler 06ecf6aae7 Cleaned the signature of two methods of TrackedRace 2014-01-22 18:24:25 +01:00
Frederik Petersen c99cb73d3e Changed carried points storing 2014-01-22 17:04:46 +01:00
Simon Pamies 6689927305 Added new method getDistanceFromStarboardSideOfStartLine that computes
result based on given timepoint - this is useful if you want to compute
the distance before the start of the race
2014-01-22 16:45:30 +01:00
Axel Uhl 37b609d25a Merge branch 'master' into racecommittee_app
Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/NoAddingRaceLogWrapper.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/server/SailingServiceImpl.java
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Leaderboard.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/LeaderboardEditing.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/PolarSheets.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/RaceBoard.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/RegattaOverview.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Simulator.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Spectator.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/TvView.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/UserManagement.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/VideoPopup.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/YoutubePopup.gwt.xml
2014-01-21 22:51:44 +01:00
Axel Uhl a5083691a2 fixing the fix of the previous commit which still caused and endless recursion 2014-01-21 21:25:00 +01:00
Axel Uhl 5e97ea3b0e fixed endless recursion during wind loading and notification that was introduced by commit 95e4be71a4 2014-01-21 21:13:40 +01:00
Axel Uhl 3c0472974a typo in comment 2014-01-21 20:59:44 +01:00
Simon Pamies 3c18d2e0ae Extended LeaderboardEdit page with uncorrected net points. This is
especially useful to see differences between corrected and uncorrected
scores.
2014-01-21 17:55:30 +01:00
Nick Klose eaa7a1aff1 Deleted MockedPolarSheet used for testing and edited some tests. 2014-01-21 11:40:18 +01:00
Axel Uhl 53ef4ea85c fix for bug1707: storing score corrections also for competitors not currently attached to leaderboard 2014-01-20 22:04:01 +01:00
Axel Uhl 002e4ba001 fixed comment formatting 2014-01-20 14:38:21 +01:00
Axel Uhl 95e4be71a4 fixed bug 1697 by expanding the wind estimation interval to invalidate when a fix is changed on a sparsely populated track 2014-01-17 17:53:09 +01:00
Axel Uhl ce815af3e9 be more conservative in the wind estimator and require less than only half the minimum maneuver angle for !hasDirectionChange 2014-01-17 16:00:31 +01:00
Nick Klose a2051c1903 Fixed NullPointerException in MarkPassing tests. 2014-01-17 13:02:05 +01:00
Nick Klose a172d69861 Edits after review for merge with master. 2014-01-17 11:36:28 +01:00
Nick Klose 6f89b80167 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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
2014-01-15 17:52:07 +01:00
Nick Klose 438ed64053 Got multithreading working again. 2014-01-15 17:45:56 +01:00
Nick Klose 85b0ad589d Fixed some bugs. 2014-01-15 15:30:00 +01:00
Nick Klose 0aa295844e Edited JavaDocs. 2014-01-15 11:38:19 +01:00
Nick Klose e4098ae874 Added toStrings for candidate and edge 2014-01-14 17:57:58 +01:00
Nick Klose f6f9e9d539 Changed MockedPolars to test both races. 2014-01-13 18:36:00 +01:00
Nick Klose 8eae4370d1 Fixed Nullpointer in chooser. 2014-01-13 15:04:45 +01:00
Nick Klose 478b118a12 First edit of lazy start time. 2014-01-13 14:14:13 +01:00
Nick Klose 5b68ed3e99 Went back to old incremental calc after finding the real problem: start time ecomes later than request. 2014-01-10 17:31:44 +01:00
Nick Klose 094b589738 Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2014-01-10 13:58:08 +01:00
Lennart Hensler a6dc309371 Merge remote-tracking branch 'origin/master' into dataMining 2014-01-10 13:18:07 +01:00
Axel Uhl 27092b8d76 fix for the fix of bug 1686; had to use && instead of || of course... 2014-01-09 22:47:33 +01:00
Axel Uhl 4ede7dc2f6 fixed bug 1686: NPE when computing distance to starboard side of start line when one mark's position is unknown 2014-01-09 22:15:51 +01:00
Nick Klose 3626843166 Added OBMR tests and removed mark from markpassing. 2014-01-09 18:06:54 +01:00
Nick Klose 85a7f5d9e0 Got whole race and start working for floreanopolis. 2014-01-09 16:51:26 +01:00
Lennart Hensler 2ea2816a80 Merge remote-tracking branch 'extern/master' into dataMining
Conflicts:
	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/pom.xml
2014-01-08 11:16:05 +01:00
Nick Klose fdf199fac8 Working on bug in finder during incremental calculation. 2014-01-07 18:06:36 +01:00
Nick Klose a0517dfa76 Merge branch 'master' into mark-rounding-inference 2014-01-06 22:56:10 +01:00
Nick Klose a2dd7e7784 Moved and refactored the test for markpassingdetection. 2014-01-06 22:32:47 +01:00
Simon Pamies f41128247b Adding description of method getAverageSpeedOverGround 2013-12-22 13:40:57 +01:00
Simon Pamies 09460f0604 Adding getAverageSpeedOverGround to AbstractSimpleLeaderboardImpl. This
method returns null if one of the races has not been finished.
2013-12-22 13:39:53 +01:00
Simon Pamies 2bcfb3c7ff If a competitor has not finished a race then we can't tell anything
about the distance traveled (if we still want to make this value
comparable)
2013-12-22 12:32:14 +01:00
Simon Pamies 1febdae995 Reverted c2aee1a9cc because this changes
the semantics. The semantics change needs to be discussed further before
implementing it at such a critical level.
2013-12-22 11:52:19 +01:00
Simon Pamies d09e34f8db Updated reference timepoint for SpeedWithConfidenceImpl 2013-12-20 16:08:14 +01:00
Simon Pamies e74ddaafaf Changed method signature to use SpeedWithConfidence 2013-12-20 15:48:19 +01:00
Nick Klose 0acac0b90a More little stuff. 2013-12-20 14:05:07 +01:00