Axel Uhl
a581b24d60
Merge branch 'master' into bug1018
2015-05-30 11:06:24 +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
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
ba1fceecaa
added fields to capture time-on-time / time-on-distance on competitor and pass values through all constructors and operations and JSON serialization
2015-05-14 20:10:20 +02:00
Axel Uhl
869967f5b6
Merge branch 'master' into bug1018
...
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLeg.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
The merge conflict was largely caused by the introduction of target time estimation which conflicted with a few
new methods introduced on branch bug1018
2015-05-13 00:21:21 +02:00
Axel Uhl
acb3b69878
added column to RegattaListComposite showing RankingMetric; moved a separate RankingMetrics enum to common to keep gwt.ui Java8-free
2015-05-12 22:04:45 +02:00
Axel Uhl
3c0555eb0f
added persistence support for Regatta.getRankingMetric() and pulled the constructor parameter through many more constructor layers
2015-05-12 09:49:38 +02:00
Frederik Petersen
708770d5af
Added new target time method using polar service
...
see bug2716
2015-05-11 11:58:15 +02:00
Axel Uhl
5fcb99964e
Merge branch 'master' into bug1018
...
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
2015-04-27 10:26:45 +02:00
Axel Uhl
ed61343693
fixing test Regatta mock implementations after adding method for ranking metric constructor
2015-04-25 00:13:28 +02:00
Frederik Petersen
9cff25eab8
Merge branch 'master' into bug2700
...
Conflicts:
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceResultOfCompetitorWithContext.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/PolarDataService.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java
java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java
java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/PolarResource.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
2015-04-23 13:36:00 +02:00
Frederik Petersen
6089c83613
Introduces polardataservice to tracked race
...
transient
can be null, needs to be handled accordingly
is null, if polar osgi bundle is stopped
2015-04-23 11:38:41 +02:00
Axel Uhl
b62f6d9ac1
Merge branch 'master' into bug1018
2015-04-21 22:40:05 +02:00
Axel Uhl
d334099dd0
made compileable again and removed warnings by consolidating imports
2015-04-21 10:44:44 +02:00
Axel Uhl
21ac8177c2
some more pass-through of WindLegTypeLegBearingCache for performance improvements; re-designed RankingMetric interface;
...
the new version of the interface returns a comparator for overall competitor ranking and a calculation for the time to improve
between a trailing and a leading competitor, determined in the trailing competitor's "time system." See bug 1018, comments
starting from #19 .
2015-04-20 18:17:53 +02:00
Axel Uhl
c1bf0240cf
introduced caching method with default implementation in RankingMetric
2015-04-17 18:08:39 +02:00
Axel Uhl
fb2e545bec
added a trivial OneDesignRankingMetric; removed more NoWindException declarations that were no longer required
2015-04-17 17:54:21 +02:00
Axel Uhl
73b3bcef85
introduced new "*Corrected*" methods on TrackedRace and TrackedLegOfCompetitor; use Duration instead of Double / seconds for gap calculation results
2015-04-17 17:18:55 +02:00
fmittag
59248fcf49
added flagImageUrl as new attribute on competitor to enable custom flags (e.g. club flags) instead of the nation flags
2015-04-16 17:38:08 +02:00
Axel Uhl
68f70a8375
Merge branch 'master' into bug489
...
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
2015-04-07 13:20:54 +02:00
Axel Uhl
094234b654
moved all Position-related classes including Compact... representations to common bundle; provided CustomFieldSerializer for all Position subclasses that require it
2015-04-03 16:12:21 +02:00
Axel Uhl
58bd451481
moved other Position implementations to common packages to share them with GWT and make then GWT-serializable
2015-04-02 16:42:10 +02:00
fmittag
2f08fb7a4e
added a new method getLastLegStarted(timepoint) on trackedRace to improve leg progress calculation
2015-04-02 16:32:50 +02:00
Axel Uhl
6972ac9171
replaced PositionDTO by Position and DegreePosition
2015-04-02 12:06:39 +02:00
Alexander Ries
50a32e3558
fixed conflicts in Dummy and Moqued TrackedRaces
2015-04-01 10:31:21 +02:00
Alexander Ries
8d3cb289d5
added getGateStartGolfDownTime() method to TrackedRace
2015-04-01 10:23:41 +02:00
Axel Uhl
44d7bb2d77
offering users to enable our own mark passing calculation also for SwissTiming live races
2015-03-31 17:35:16 +02:00
Axel Uhl
e1e047bd75
Merge branch 'master' into mark-rounding-inference
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
java/com.sap.sailing.domain/META-INF/MANIFEST.MF
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.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
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaanalytics/RegattaAnalyticsDataManager.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/seriesanalytics/EventSeriesAnalyticsDataManager.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/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/raceboard/RaceBoardPanel.java
2015-03-26 14:51:48 +01:00
Axel Uhl
911cdeb86b
Merge branch 'master' into jbross-buoy-tender
...
Conflicts:
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
2015-03-23 20:52:00 +01:00
Axel Uhl
f8c16d1049
Merge branch 'jbross-buoy-tender' into bug2724
...
Conflicts:
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingAdapterImpl.java
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
2015-03-23 16:18:37 +01:00
Axel Uhl
641b02357f
Merge branch 'master' into bug2715
...
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
2015-03-20 17:44:35 +01:00
Axel Uhl
103ffcdd3d
fixed compilation error in test code after changes in LeaderboardPanel
2015-03-20 17:30:23 +01:00
Axel Uhl
495cd85bd0
added distance-considering-gate-start metric also at race level
2015-03-20 14:18:59 +01:00
Axel Uhl
5fd384af5c
added metric for distance including gate start consideration to leaderboard and REST API
2015-03-20 13:34:44 +01:00
Jan Broß
ec20a6042f
Return latest known position if existent when pinging mark
2015-03-18 16:05:23 +01:00
Axel Uhl
02e70fc1d9
preparing for rank-over-wind data analysis
2015-03-10 15:42:36 +01:00
Frederik Petersen
1576b00aef
Cleaned up least squares implementations and tests
2015-02-17 13:03:19 +01:00
Axel Uhl
b037a465a9
Merge branch 'master' into jbross-email-invitation
...
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
2015-02-15 09:03:34 +01:00
Axel Uhl
39b1c55a88
made compileable after master mergeMerge branch 'master' into ftes-mail-move-to-sse
...
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
java/com.sap.sse.security.test/META-INF/MANIFEST.MF
java/com.sap.sse.security.test/src/com/sap/sse/security/test/LoginTest.java
java/com.sap.sse.security/src/com/sap/sse/security/impl/Activator.java
java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
2015-02-14 21:23:24 +01:00
Axel Uhl
f96f0b82de
fixed bug 2063
2015-02-13 12:59:35 +01:00
Fredrik Teschke
04608c2ae7
add email to constructor of CompetitorImpl and fix bug (competitor email not loading on startup)
2015-02-10 00:49:53 +01:00
Fredrik Teschke
182dbd2571
Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
...
Conflicts:
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
2015-02-09 21:39:14 +01:00
Fredrik Teschke
e004c433cc
pull out mail functionality into own service and bundle
...
- needs to live outside com.sap.sse due to dependency on replication
- use mail.properties instead of security.properties
- introduced ServiceTrackerFactory, which led to refactorings in SailingServiceImpl and ~Mock
2015-02-09 21:03:50 +01:00
Jan Broß
d0407c1584
Get additional competitors of racelog in RegattaImpl
2015-02-05 12:31:45 +01:00
Nicolas
71a0c68499
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/SailingServiceAsync.java
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
2015-02-04 17:38:16 +01:00
Axel Uhl
e514e756d4
removed redundant version specifiers in gwt.ui.test manifest
2015-02-02 16:33:26 +01:00
Axel Uhl
baf7bcbe73
Merge branch 'master' into ftes-file-storage
...
Conflicts:
java/com.sap.sailing.feature/feature.xml
java/pom.xml
2015-02-02 10:47:01 +01:00
Nicolas
218cdef749
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
2015-01-31 16:00:11 +01:00
Steffen Schaefer
49e0ff9bcc
Merge branch 'master' into gwt-27-second-try
...
Conflicts:
java/com.sap.sailing.feature/feature.xml
java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode
only).launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/pom.xml
2015-01-26 09:00:40 +01:00
Axel Uhl
Frederik Petersen
fmittag
Alexander Ries
Jan Broß
Fredrik Teschke
Nicolas
Steffen Schaefer