stud203990/Treker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ScoreList: Revert recent changes to computation of scores

Browse Source
This commit is contained in:
Alinson S. Xavier 2020-09-02 07:01:54 -05:00
parent c846dfc75a
commit 9d28fbe7b5
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,16 +275,13 @@ public abstract class ScoreList implements Iterable<Score>
for (int i = 0; i < checkmarkValues.length; i++) for (int i = 0; i < checkmarkValues.length; i++)
{ {
double value = checkmarkValues[checkmarkValues.length - i - 1]; double value = checkmarkValues[checkmarkValues.length - i - 1];
if (!habit.isNumerical() || value != Checkmark.SKIPPED) if (habit.isNumerical())
{ {
if (habit.isNumerical()) value /= 1000;
{ value /= habit.getTargetValue();
value /= 1000;
value /= habit.getTargetValue();
}
value = Math.min(1, value);
previousValue = Score.compute(freq, previousValue, value);
} }
value = Math.min(1, value);
previousValue = Score.compute(freq, previousValue, value);
scores.add(new Score(from.plus(i), previousValue)); scores.add(new Score(from.plus(i), previousValue));
} }