eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-18 02:00:58 +00:00
Code Activity

renamed variables after generalization of getValueSumRecursively

Browse Source 
Change-Id: Icd7a2127f56d77f9242386ad257d26a853069eed
This commit is contained in:
Axel Uhl committed 2017-11-23 18:23:21 +01:00
1 parent 192e3aa497
commit 707d1cfeff
1 file changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/impl/TrackImpl.java
+6 -6
View File
@@ -479,22 +479,22 @@ public class TrackImpl<FixType extends Timed> implements Track<FixType> {
perfectCacheHit = true; // potentially a cache hit; but if it doesn't span the full interval, it's not perfect; see below
// compute the missing stretches between best cache entry's "from" and our "from" and the cache
// entry's "to" and our "to"
T distanceFromFromToBeginningOfCacheEntry = nullElement;
T distanceFromEndOfCacheEntryToTo = nullElement;
T valueFromFromToBeginningOfCacheEntry = nullElement;
T valueFromEndOfCacheEntryToTo = nullElement;
if (!bestCacheEntry.getB().getA().equals(from)) {
assert bestCacheEntry.getB().getA().after(from);
perfectCacheHit = false;
distanceFromFromToBeginningOfCacheEntry = getValueSumRecursively(from, bestCacheEntry
valueFromFromToBeginningOfCacheEntry = getValueSumRecursively(from, bestCacheEntry
.getB().getA(), recursionDepth + 1, nullElement, adder, cache, valueCalculator);
}
if (!bestCacheEntry.getA().equals(to)) {
assert bestCacheEntry.getA().before(to);
perfectCacheHit = false;
distanceFromEndOfCacheEntryToTo = getValueSumRecursively(bestCacheEntry.getA(), to,
valueFromEndOfCacheEntryToTo = getValueSumRecursively(bestCacheEntry.getA(), to,
recursionDepth + 1, nullElement, adder, cache, valueCalculator);
}
result = adder.add(adder.add(distanceFromFromToBeginningOfCacheEntry, bestCacheEntry.getB().getB()),
distanceFromEndOfCacheEntryToTo);
result = adder.add(adder.add(valueFromFromToBeginningOfCacheEntry, bestCacheEntry.getB().getB()),
valueFromEndOfCacheEntryToTo);
} else {
if (from.compareTo(to) < 0) {
result = valueCalculator.calculate(from, to);