Commit Graph
9094 Commits
Author SHA1 Message Date
I077899 08305f35e7 I've fixed the issues from the branch-merging, and I am using the SimulatorUISelection objects. 2013-03-29 17:03:43 +02:00
I077899 7513be13eb I've added a supress warning to get rid of a warning message. 2013-03-29 17:03:11 +02:00
I077899 ce982c52fa I've fixed the issues from the branch-merging, and I am using the SimulatorUISelection objects. 2013-03-29 17:02:51 +02:00
I077899 b65b0f0a4b I've fixed the failing tests. 2013-03-29 17:01:25 +02:00
I077899 3c945a8fc5 All the path generators are now using the SimulatorUISelection objects. Also I've done some refactoring. 2013-03-29 17:00:39 +02:00
I077899 9bc61f9835 All the path generators are now using the SimulatorUISelectionDTO object. 2013-03-29 17:00:21 +02:00
I077899 9a194a18b0 All the path generators are now using the SimulatorUISelection objects. Also I've done some refactoring. 2013-03-29 16:59:38 +02:00
I077899 e129271e73 I've added missing switch cases to get rid of the warnings. 2013-03-29 16:58:26 +02:00
I077899 4ad22fbe85 New objects to handle the selection from the comboboxes in the simulator GUI. 2013-03-29 16:57:41 +02:00
I077899 f92bef4088 All of this objects are now Serializable. 2013-03-29 16:56:50 +02:00
I077899 47215b0037 I've added more serialized resources. 2013-03-29 16:55:40 +02:00
I077899 fc9e2d4539 I've modified (updated & deleted) some resources files. 2013-03-29 16:54:56 +02:00
I077899 f8483f6618 Fixed a small bug. 2013-03-27 13:32:29 +02:00
Christopher Ronnewinkel (D036654) 00360ee561 fix wait for tracked race until loaded by using TrackedRace.waitUntilNotLoading() 2013-03-26 17:00:01 +01:00
Christopher Ronnewinkel (D036654) 8bff095f54 fix sleep thread until race loading progress == 1.0 2013-03-26 16:43:16 +01:00
Christopher Ronnewinkel (D036654) 197154ccb5 fix default formatting 2013-03-25 15:47:54 +01:00
Christopher Ronnewinkel (D036654) 04f6396811 fix wind-streamlet-canvas setVisible() 2013-03-25 15:33:24 +01:00
Christopher Ronnewinkel (D036654) 906bd30dc9 Merge remote-tracking branch 'origin/master' into simulator_dev
Conflicts:
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/pom.xml
2013-03-25 14:45:06 +01:00
Christopher Ronnewinkel (D036654) 263bd46825 encapsulate getRaceHandle(); reformat some files to default-formatter; 2013-03-25 14:38:23 +01:00
Christopher Ronnewinkel (D036654) fb3b69a4dd Merge remote-tracking branch 'origin/simulator_dev' into simulator_dev
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractPosition.java
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Position.java
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Speed.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KnotSpeedWithBearingImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CompactGPSFixMovingImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CompactWindImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindTrackImpl.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTracTrac.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathImpl.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/SerializationUtils.java
2013-03-22 16:20:10 +01:00
Christopher Ronnewinkel (D036654) 717e808de9 Fix until freestyle-mode is working again, measured-mode open. 2013-03-22 16:08:33 +01:00
Axel Uhl ab7fc9c519 Fixed by 1317: ConcurrentModificationException in SmartFutureCache unpropagating lock set 2013-03-22 15:09:42 +01:00
Axel Uhl 057a479586 Largely fixed bug 1023. While it doesn't show an additional column with the race count, LowPoint and HighPoint and all
their derived schemes rank a competitor better if it has more races; all races of those schemes are now always
considered valid for total points score. The old implementation is still in AbstractScoringScheme in case someone
needs them in a specific scheme.
2013-03-22 15:04:18 +01:00
Axel Uhl 98c14212aa Merge remote-tracking branch 'server/master' 2013-03-22 14:05:55 +01:00
Axel Uhl 0313c26a2d in LockUtil, consider the possibility that a thread from which locks are to be carried over doesn't hold any 2013-03-22 14:03:05 +01:00
I077899 0adfb84db8 I got rid of the isTurn method from the AbstractPosition 2013-03-22 14:11:07 +02:00
I077899 012850ec68 I've removed the "scale" method :) 2013-03-22 14:05:40 +02:00
fmittag 331aadae0c Merge remote-tracking branch 'origin/leaderboard_json_doc_and_test' 2013-03-22 11:53:12 +01:00
fmittag 75751b7550 Merge remote-tracking branch 'origin/master' into leaderboard_json_doc_and_test 2013-03-22 11:51:13 +01:00
fmittag a36606226f added sample json files for all json exports 2013-03-22 11:47:02 +01:00
Axel Uhl eb7245c3dc added a comment on the minimum size of the thread pool for the SmartFutureCache 2013-03-22 11:26:52 +01:00
fmittag 8b8989dc3e fixed missing method renaming 2013-03-22 10:58:30 +01:00
fmittag e4a4219624 replaced EventDataJsonExportServlet accessible via /rc/events with more general EventsJsonExportServlet via /events 2013-03-22 10:54:21 +01:00
fmittag 4681e78b61 Merge remote-tracking branch 'origin/master' into leaderboard_json_doc_and_test
Conflicts:
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AddDefaultRegatta.java
2013-03-22 10:45:34 +01:00
Axel Uhl 3dfc8ca0e7 apply lock propagation also to write locks 2013-03-22 00:34:45 +01:00
Axel Uhl f9292e64c3 added lock propagation to LeaderboardDTOCache and SmartFutureCache 2013-03-22 00:28:23 +01:00
Axel Uhl 82b464eafe added comment to SmartFutureCache.triggerUpdate to explain the need for randomization in case of mass updates 2013-03-22 00:09:14 +01:00
Axel Uhl e73b325db7 Merge remote-tracking branch 'server/master' 2013-03-21 23:59:20 +01:00
Axel Uhl 91b684804b use a single ThreadPool for all SmartFutureCache instances, 3*availableProcessors in size; shuffle multi-cache-invalidations;
when invalidating a SmartFutureCache for a number of keys, if this always happens in the same order, the first few keys
will be re-computed over and over again because cancelling them is not possible as they have already started, but a new
re-calculation needs to be triggered still. All later keys will be appended to the ordered queue but will keep getting
canceled because they haven't started their calculation yet. By shuffling the keys before triggering their invalidation,
all elements will fairly get re-calculated every now and then.
2013-03-21 23:53:39 +01:00
Axel Uhl 9b3f696620 use a ConcurrentHashMap to avoid issues in LockUtil caused by concurrent access to the lockCounts map 2013-03-21 23:48:08 +01:00
Axel Uhl 40af74b11b trying to fix bug 1312 by allowing LeaderboardDTOCache to use stale results of CrossTrackErrorCache and ManeuverCache;
The LeaderboardDTOCache is invalidated upon each GPS fix received; therefore, by and large, the LeaderboardDTOCache will
be invalidated each time the maneuver and cross track error caches will be invalidated. Only in very bizarre situations
such as the end of the race stopping all GPS fixes would the LeaderboardDTOCache keep some stale results for the very end
of the race. The likelihood seems sufficiently small to tolerate the risk.
2013-03-21 22:12:00 +01:00
Axel Uhl 51ddeef2b8 working towards a solution against read-read locks when first reader waits for second reader (see bug 1313) 2013-03-21 21:22:01 +01:00
Armin Zamani d1f64c456d renamed "CourseData" to "CourseBase", "EventData" to "EventBase" and
"SeriesData" to "SeriesBase", and their impl-classes accordingly,
renamed "CourseDataJsonSerializer" to "CourseBaseJsonSerializer"
2013-03-21 18:30:30 +01:00
Armin Zamani c97edeb46b Renamed AddToRaceLogJsonExportServlet to
AddEntryToRaceLogJsonPostServlet, renamed path /rc/leaderboards to
/rc/racegroups
2013-03-21 18:28:13 +01:00
fmittag 887b2ec5dd added a json export servlet for sailing events 2013-03-21 18:05:48 +01:00
Axel Uhl feaea37a0c improved trace output for locking 2013-03-21 17:43:23 +01:00
Christopher Ronnewinkel (D036654) 9e59647df1 Fix further errors after merge. 2013-03-21 17:29:43 +01:00
fmittag 9e0b09fab7 added test cases for json export of a leaderboard with "Live" and "Final" result state 2013-03-21 14:37:58 +01:00
Christopher Ronnewinkel (D036654) bf00fafee5 Fix errors after merge. 2013-03-21 13:48:22 +01:00
Axel Uhl 855b22f825 small changes in architecture model 2013-03-21 13:22:17 +01:00