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

ScoreList: Recompute given interval

Browse Source
This commit is contained in:
Alinson S. Xavier
2020-12-29 13:42:11 -06:00
parent d0c37fef67
commit 4a3a767cb2
3 changed files with 31 additions and 11 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/Habit.kt
View File

@@ -76,11 +76,19 @@ data class Habit(
frequency = frequency, frequency = frequency,
isNumerical = isNumerical, isNumerical = isNumerical,
) )
val to = DateUtils.getTodayWithOffset()
val entries = computedEntries.getKnown()
var from = entries.lastOrNull()?.timestamp ?: to
if (from.isNewerThan(to)) from = to
scores.recompute( scores.recompute(
this.frequency, this.frequency,
this.isNumerical, this.isNumerical,
this.targetValue, this.targetValue,
this.computedEntries this.computedEntries,
from,
to
) )
} }

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

@@ -80,25 +80,21 @@ public class ScoreList
Frequency frequency, Frequency frequency,
boolean isNumerical, boolean isNumerical,
double targetValue, double targetValue,
EntryList computedEntries EntryList computedEntries,
Timestamp from,
Timestamp to
) )
{ {
list.clear(); list.clear();
if (computedEntries.getKnown().isEmpty()) return;
List<Entry> entries = computedEntries.getKnown(); if (from.isNewerThan(to)) return;
if (entries.isEmpty()) return;
Entry oldest = entries.get(entries.size() - 1);
Timestamp today = DateUtils.getTodayWithOffset();
Timestamp from = oldest.getTimestamp();
if (from.isNewerThan(today)) return;
double rollingSum = 0.0; double rollingSum = 0.0;
int numerator = frequency.getNumerator(); int numerator = frequency.getNumerator();
int denominator = frequency.getDenominator(); int denominator = frequency.getDenominator();
final double freq = frequency.toDouble(); final double freq = frequency.toDouble();
final Integer[] values = computedEntries final Integer[] values = computedEntries
.getByInterval(from, today) .getByInterval(from, to)
.stream() .stream()
.map(Entry::getValue) .map(Entry::getValue)
.toArray(Integer[]::new); .toArray(Integer[]::new);

16
android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreListTest.java
View File

@@ -249,6 +249,22 @@ public class ScoreListTest extends BaseUnitTest
assertThat(habit.getScores().get(today).getValue(), closeTo(0.054816, E)); assertThat(habit.getScores().get(today).getValue(), closeTo(0.054816, E));
} }
@Test
public void test_addThenRemove()
{
Habit habit = fixtures.createEmptyHabit();
habit.recompute();
assertThat(habit.getScores().get(today).getValue(), closeTo(0.0, E));
habit.getOriginalEntries().add(new Entry(today, YES_MANUAL));
habit.recompute();
assertThat(habit.getScores().get(today).getValue(), closeTo(0.051922, E));
habit.getOriginalEntries().add(new Entry(today, UNKNOWN));
habit.recompute();
assertThat(habit.getScores().get(today).getValue(), closeTo(0.0, E));
}
private void check(final int offset) private void check(final int offset)
{ {
EntryList entries = habit.getOriginalEntries(); EntryList entries = habit.getOriginalEntries();