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

ScoreList: Fix interaction between SKIP and rolling sum

Browse Source
This commit is contained in:
Alinson S. Xavier
2020-09-16 07:38:59 -05:00
parent c429cb41c0
commit ddea9e78a9
2 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java
View File

@@ -298,16 +298,18 @@ public abstract class ScoreList implements Iterable<Score>
double percentageCompleted = Math.min(1, rollingSum / 1000 / habit.getTargetValue());
previousValue = Score.compute(freq, previousValue, percentageCompleted);
}
else if (checkmarkValues[offset] != Checkmark.SKIP)
else
{
if (checkmarkValues[offset] == YES_MANUAL)
rollingSum += 1.0;
if (offset + denominator < checkmarkValues.length)
if (checkmarkValues[offset + denominator] == YES_MANUAL)
rollingSum -= 1.0;
double percentageCompleted = Math.min(1, rollingSum / numerator);
previousValue = Score.compute(freq, previousValue, percentageCompleted);
if (checkmarkValues[offset] != SKIP)
{
double percentageCompleted = Math.min(1, rollingSum / numerator);
previousValue = Score.compute(freq, previousValue, percentageCompleted);
}
}
scores.add(new Score(from.plus(i), previousValue));
}