isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

simplify scoring code

Browse Source
This commit is contained in:
KristianTashkov
2021-09-12 16:56:08 +03:00
parent fe1d5c66cb
commit 65d237254c
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ScoreList.kt
View File

@@ -100,19 +100,18 @@ class ScoreList {
rollingSum -= max(0, values[offset + denominator]) rollingSum -= max(0, values[offset + denominator])
} }
var percentageCompleted = 0.0
val normalizedRollingSum = rollingSum / 1000 val normalizedRollingSum = rollingSum / 1000
if (numericalHabitType == NumericalHabitType.AT_LEAST) { val percentageCompleted = if (numericalHabitType == NumericalHabitType.AT_LEAST) {
percentageCompleted = if (targetValue > 0) if (targetValue > 0)
min(1.0, normalizedRollingSum / targetValue) min(1.0, normalizedRollingSum / targetValue)
else else
1.0 1.0
} else if (numericalHabitType == NumericalHabitType.AT_MOST) { } else {
percentageCompleted = if (targetValue > 0 && normalizedRollingSum > targetValue) if (targetValue > 0) {
max( (1 - ((normalizedRollingSum - targetValue) / targetValue)).coerceIn(0.0, 1.0)
0.0, 1 - ((normalizedRollingSum - targetValue) / targetValue) } else {
) if (normalizedRollingSum > 0) 0.0 else 1.0
else if (normalizedRollingSum <= targetValue) 1.0 else 0.0 }
} }
previousValue = compute(freq, previousValue, percentageCompleted) previousValue = compute(freq, previousValue, percentageCompleted)