8f88495398f27004e11452168e948586c86c2fed
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
| ... | ... | @@ -387,7 +387,7 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl |
| 387 | 387 | * Whether during {@link #cachesSuspended suspended caches mode} the maneuver re-calculation was triggered; will lead |
| 388 | 388 | * to triggering the maneuver re-calculation when caches are {@link #resumeAllCachesNotUpdatingWhileLoading() resumed}. |
| 389 | 389 | */ |
| 390 | - //private boolean triggerManeuverCacheInvalidationForAllCompetitors; |
|
| 390 | + private boolean triggerManeuverCacheInvalidationForAllCompetitors; |
|
| 391 | 391 | |
| 392 | 392 | /** |
| 393 | 393 | * Keys are the {@link RaceLog#getId() IDs} of the race logs that are stored as values. |
| ... | ... | @@ -502,8 +502,9 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl |
| 502 | 502 | public TrackedRaceImpl(final TrackedRegatta trackedRegatta, RaceDefinition race, final Iterable<Sideline> sidelines, |
| 503 | 503 | final WindStore windStore, long delayToLiveInMillis, final long millisecondsOverWhichToAverageWind, |
| 504 | 504 | long millisecondsOverWhichToAverageSpeed, long delayForWindEstimationCacheInvalidation, |
| 505 | - boolean useInternalMarkPassingAlgorithm, RaceLogAndTrackedRaceResolver raceLogResolver, TrackingConnectorInfo trackingConnectorInfo, |
|
| 506 | - MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) { |
|
| 505 | + boolean useInternalMarkPassingAlgorithm, RaceLogAndTrackedRaceResolver raceLogResolver, |
|
| 506 | + TrackingConnectorInfo trackingConnectorInfo, MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, |
|
| 507 | + ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) { |
|
| 507 | 508 | this(trackedRegatta, race, sidelines, windStore, delayToLiveInMillis, millisecondsOverWhichToAverageWind, |
| 508 | 509 | millisecondsOverWhichToAverageSpeed, delayForWindEstimationCacheInvalidation, |
| 509 | 510 | useInternalMarkPassingAlgorithm, OneDesignRankingMetric::new, raceLogResolver, trackingConnectorInfo, |
| ... | ... | @@ -527,7 +528,8 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl |
| 527 | 528 | long millisecondsOverWhichToAverageSpeed, long delayForWindEstimationCacheInvalidation, |
| 528 | 529 | boolean useInternalMarkPassingAlgorithm, RankingMetricConstructor rankingMetricConstructor, |
| 529 | 530 | RaceLogAndTrackedRaceResolver raceLogResolver, TrackingConnectorInfo trackingConnectorInfo, |
| 530 | - MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) { |
|
| 531 | + MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, |
|
| 532 | + ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) { |
|
| 531 | 533 | super(race, trackedRegatta, windStore, millisecondsOverWhichToAverageWind); |
| 532 | 534 | distancesFromStarboardSideOfStartLineProjectedOntoLineCache = new ConcurrentHashMap<>(); |
| 533 | 535 | distancesFromStarboardSideOfStartLineProjectedOntoLineCacheLastAccessTimes = new ConcurrentHashMap<>(); |
| ... | ... | @@ -1081,10 +1083,6 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl |
| 1081 | 1083 | */ |
| 1082 | 1084 | private final String updateStartOfRaceCacheFieldsMonitor = ""+new Random().nextDouble(); |
| 1083 | 1085 | |
| 1084 | - private boolean triggerManeuverCacheInvalidationForAllCompetitors; |
|
| 1085 | - |
|
| 1086 | - protected int attachedRaceLogsCount; |
|
| 1087 | - |
|
| 1088 | 1086 | protected void updateStartOfRaceCacheFields() { |
| 1089 | 1087 | synchronized (updateStartOfRaceCacheFieldsMonitor) { |
| 1090 | 1088 | TimePoint newStartTime = null; |
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaImpl.java
| ... | ... | @@ -324,7 +324,7 @@ public abstract class TrackedRegattaImpl implements TrackedRegatta { |
| 324 | 324 | long millisecondsOverWhichToAverageWind, long millisecondsOverWhichToAverageSpeed, |
| 325 | 325 | DynamicRaceDefinitionSet raceDefinitionSetToUpdate, boolean useInternalMarkPassingAlgorithm, RaceLogAndTrackedRaceResolver raceLogResolver, |
| 326 | 326 | Optional<ThreadLocalTransporter> threadLocalTransporter, TrackingConnectorInfo trackingConnectorInfo, |
| 327 | - MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry,ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry ) { |
|
| 327 | + MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry ) { |
|
| 328 | 328 | logger.log(Level.INFO, "Creating DynamicTrackedRaceImpl for RaceDefinition " + raceDefinition.getName()); |
| 329 | 329 | DynamicTrackedRaceImpl result = new DynamicTrackedRaceImpl(this, raceDefinition, sidelines, windStore, |
| 330 | 330 | delayToLiveInMillis, millisecondsOverWhichToAverageWind, |