Got the score chart to work

pull/1319/head
Jakub Kalinowski 4 years ago
parent b75d5eeb34
commit 3b650d63b4

@ -100,20 +100,25 @@ class ScoreList {
} }
val normalizedRollingSum = rollingSum / 1000 val normalizedRollingSum = rollingSum / 1000
val percentageCompleted = if (!isAtMost) { if(values[offset] != Entry.SKIP) {
if (targetValue > 0) val percentageCompleted = if (!isAtMost) {
min(1.0, normalizedRollingSum / targetValue) if (targetValue > 0)
else min(1.0, normalizedRollingSum / targetValue)
1.0 else
} else { 1.0
if (targetValue > 0) {
(1 - ((normalizedRollingSum - targetValue) / targetValue)).coerceIn(0.0, 1.0)
} else { } else {
if (normalizedRollingSum > 0) 0.0 else 1.0 if (targetValue > 0) {
(1 - ((normalizedRollingSum - targetValue) / targetValue)).coerceIn(
0.0,
1.0
)
} else {
if (normalizedRollingSum > 0) 0.0 else 1.0
}
} }
}
previousValue = compute(freq, previousValue, percentageCompleted) previousValue = compute(freq, previousValue, percentageCompleted)
}
} else { } else {
if (values[offset] == Entry.YES_MANUAL) { if (values[offset] == Entry.YES_MANUAL) {
rollingSum += 1.0 rollingSum += 1.0

Loading…
Cancel
Save