Commit Graph
333 Commits
Author SHA1 Message Date
Axel Uhl 8d772196de Adding com.sun.istack bundle to satisby jaxb implementation bundle's imports
Change-Id: Ia2a93ad709c16f81dcb3d9d15d2117e509f9c4e1
2018-11-26 22:11:52 +01:00
Axel Uhl 6c04f43d54 added jaxb-api and jaxb-impl as well as com.sun.activation.javax.activation to local p2 and target platform definition
Change-Id: I26de811d87e83660642e526f35a05baa0fbb53bb
2018-11-26 01:13:01 +01:00
Axel Uhl bc94bcfad4 added dependency from polars to javax.xml.bind
Change-Id: I4db95f12a09618954c223b57b52e16e59e2a9f37
2018-11-25 19:52:18 +01:00
Vladislav Chumak 77d25eb580 Fixed fallback twa for jibes 2018-07-25 15:16:22 +02:00
Vladislav Chumak b51671237f Corrected minDiff calculation between best maneuver angle candidates 2018-07-25 12:53:38 +02:00
Vladislav Chumak 01fe50ff04 Fixed incorrect maneuver angle calculation from twa in
getManeuverLikelihoodAndTwsTwa
2018-07-25 12:23:11 +02:00
Alessandro Stoltenberg 1f41b2c964 bug4572: refactoring and deleting old entries for maneuver.maneuverLoss replaced by maneuver.maneuverLoss.projectedDistanceLost. Changes made respectivly also for the corresponding DTOs. 2018-07-09 15:39:49 +02:00
Axel Uhl 8c9477dac0 tried to merge master; failed for ManeuverWithCoarseGrainedBoundariesImpl; Alessandro, please continue
Change-Id: I03bccd6ad5291464d0aa08b1f64902be57702713
2018-07-09 13:51:10 +02:00
Vladislav Chumak 316ccc3b43 Added polar feature to exported estimation data + corrected polars bugs 2018-07-05 10:52:05 +02:00
Alessandro Stoltenberg e512cb78eb Merge remote-tracking branch 'origin/master' into bug4572 2018-06-18 18:02:06 +02:00
Alessandro Stoltenberg d2d38412ef Renamed all getManeuver() methods that have return type Distance to getManeuverLossDistanceLost()
Renamed all variables maneuverLoss of type Distance to maneuverLossDistanceLost
2018-05-17 15:21:20 +02:00
Maximilian Groß ed1fae0c8f divided datamining from sailing specific classes 2018-04-12 07:40:59 +02:00
Axel Uhl 360f72a6a7 Merge branch 'master' into bug2822_boatcolors 2018-03-24 08:49:11 +01:00
Axel Uhl bd90f921dd added Automatic-Module-Name headers to satisfy Oxygen.3 Java9 warnings rule 2018-03-24 01:45:37 +01:00
Frank Mittag 8b82e2c20c Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
#	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RawPositionReceiver.java
#	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
2018-03-05 16:45:42 +01:00
Axel Uhl 5330c621b1 fixed Javadoc after beat angle --> TWA rename
Change-Id: I11f3821cf661ef5113dde498b2ee71263b82c118
2018-02-26 16:00:24 +01:00
Kai Boernert a4b23289b5 renamed to twa 2018-02-26 13:24:56 +01:00
Kai Boernert cde3ac9210 Moved BeatAngle calculations to trackedrace level, as no leg values are
used anyway. In the chart is is rendered nearly pixel perfect. 
changed English text
Adjusted test cases to use the new method.
2018-02-22 15:45:04 +01:00
Frank Mittag d2b3fc62c0 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes 2018-02-21 10:48:43 +01:00
Steffen Schaefer fa1d53edfd Bug 4450: removed unused websocket bundles 2018-02-16 08:50:23 +01:00
Steffen Schaefer f6851c53c7 Bug 4442: Updated Jetty dependencies to consistently use version 9.4.8 2018-02-06 15:46:26 +01:00
Steffen Schaefer 572d2fdf68 Bug 4442: Removed the usage of websocket server 2018-02-06 15:38:16 +01:00
Frank Mittag d45de24610 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
#	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTO.java
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/DomainObjectFactory.java
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
#	java/com.sap.sailing.domain.test/resources/IncrementalLeaderboardDTO.ser
#	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardPlace.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/utils/AutoplayHelper.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/LeaderboardSettingsFactory.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardSettingsDialogComponent.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/SingleRaceLeaderboardSettingsDialogComponent.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorRegistrationsPanel.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogImportSensorDataAndAddMappingsDialog.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiRaceLeaderboardPanel.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/EmbeddedMapAndWindChartEntryPoint.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
#	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
#	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java
#	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaReplicationTest.java
#	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-11-22 15:39:00 +01:00
Axel Uhl 4c8209624f bug 4297: fixing deadlock by first copying fixes, the releasing track lock, then calling processElement
Change-Id: Id30d1205d807ef992ff7d2d60184e18deeec389d
2017-08-31 19:22:25 +02:00
Frank Mittag c5f08e3dfa Fixed compile errors after lastest master merge (caused my Competitor/Boat separation related issues) 2017-08-28 16:57:22 +02:00
Frank Mittag 68ae4f561c Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
#	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/CompetitorImpl.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
#	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/base/impl/AbstractRaceColumn.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.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/ui/client/StringMessages.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
#	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-08-28 16:12:00 +02:00
Axel Uhl 05e4c0cf5c use a single background thread to process polar sheet to avoid queuing
Change-Id: I3c88c7e9ca5f734327a0a75e35b19cc38f4b3ef2
2017-08-18 17:00:11 +02:00
Axel Uhl 0a904142ee Together with Frederik concluded there is no need for synchronization on fixQueue if isEmpty() and poll() are combined into a single poll() call
Change-Id: I0d29e5159c68fb77392e7de1824ff09869fc0f17
2017-08-18 15:35:56 +02:00
Axel Uhl 5849e5f910 whitespace changes only
Change-Id: Ie8370d70fdb66f70599350ef413f01123d4c1d93
2017-08-16 21:01:23 +02:00
Axel Uhl 2a6620a085 whitespace change only
Change-Id: I2713c8540e5d5786bf1e80fcb2c874dc081690f7
2017-08-16 15:56:54 +02:00
Axel Uhl 1fca54646b small code style change
Change-Id: I31ac8f8b5d7d0c47c902fbc9d03b43307237748c
2017-08-16 00:14:40 +02:00
Frank Mittag 78bcf32976 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
#	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
#	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
#	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboards.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/comparators/CompetitorSailIdComparator.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java
2017-06-21 13:50:36 +02:00
Axel Uhl 78912103a3 use name for PolarDataMiner thread pool
Change-Id: I06447b6ae1949a1394f9d0aee2a7b0c944f1aa30
2017-05-31 00:12:56 +02:00
Steffen Schäfer 1542a36109 Merge branch 'master' into bug2822_boatcolors 2017-05-16 16:12:16 +02:00
Steffen Schäfer 67d310df4b Merge branch 'master' into bug2822_boatcolors
# Conflicts:
#	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
#	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-05-16 15:59:24 +02:00
Steffen Schaefer 9123771f34 normalized line endings 2017-05-16 09:42:02 +02:00
Frank Mittag fd8fee5d58 work commit in the middle of refactoring competitor.getBoat() 2017-04-28 09:08:14 +02:00
Steffen Schaefer b30ef59837 PolarDataServiceImpl is now cleared in Selenium tests 2017-04-04 14:14:42 +02:00
Axel Uhl 7650af5809 added more upper version constraints for org.apache.httpcomponents.*
Change-Id: I2b0e9ecab3449dfe281259ba63d98d69d382c5c8
2017-01-24 00:49:23 +01:00
Axel Uhl 5c5b6d0a25 fixed issue with PolarDataService while it is importing polar data and races are being restored; see bug 4011, comment #5
Change-Id: I95ad332d5fa6826a371da228c24f2800600facb0
2016-12-30 16:32:23 +01:00
Axel Uhl 90c5a50c15 added missing WEB-INF folder to com.sap.sailing.polars' build.properties file; this should fix the 404 for the polars/api/polar_data RESTlet
Change-Id: Idc48333a7cce73584c7e7e866388e6c6b2a30549
2016-12-28 15:55:11 +01:00
Axel Uhl 44220cc718 when polar data import fails with an exception, reset the PolarDataMiner in the PolarDataServiceImpl object so polar collection can continue
Change-Id: I2b3756463cef992c17d61379eac97e2e4fb43b6a
2016-12-08 11:34:55 +01:00
Axel Uhl c925bcfcd5 removed unused methods that were added on bug2563_2's original JSON approach
Change-Id: I9bee7cda4b38d8d2058ad3ca967c81faac78a101
2016-12-08 09:52:15 +01:00
Axel Uhl f783e0c550 set a valid domain factory on the test polar service to ensure the boat class can be resolved during de-serialization
Change-Id: I628afd33791cc2bf3c25c0d1a2fc36a5e56c6d72
2016-12-07 13:50:06 +01:00
Axel Uhl d4db2c19fc adjusted polar import test to use the binary file; removed extra JSON polar serialization stuff and reverted data mining methods to proteted again where possible
Change-Id: Iab3ad4f55e307d2a89b1deccc1fd17448c54cbba
2016-12-07 11:17:26 +01:00
Axel Uhl 5286d6c628 removed JSON serializer/deserializer code for polar stuff which is no longer needed due to the use of the binary replication serialization protocol
Change-Id: I1c4163c0e29ca980acf346e649c404ef61b0e88b
2016-12-07 10:41:05 +01:00
Axel Uhl c88fce47f8 migrated polar sheet import to using initial replication serialization/deserialization to avoid redundancies
Change-Id: I960ac7daf277810afd6b4f5ff175c5842804ef48
2016-12-07 10:37:19 +01:00
Oleg Zheleznov b0da1c3f8b File encoding fix 2016-11-15 14:22:56 +03:00
Oleg Zheleznov 3890ab102f Polar Data import test 2016-11-14 16:21:22 +03:00
Axel Uhl fda13aea08 don't explicitly and redundantly serialize the list of all boat classes for which polars were serialized
Change-Id: Idb4d73c3d92427c59a8f91642b8b8fcdb30d58a0
2016-11-09 18:19:31 +01:00