langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cap calculated hard delay secs at again delay + 1d (#2229)

Browse Source
This commit is contained in:
RumovZ 2022-12-03 09:54:40 +01:00 committed by GitHub
parent f623ab5317
commit 90a3bbfdb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
rslib/src/scheduler/states/steps.rs
View File

@ -47,19 +47,29 @@ impl<'a> LearningSteps<'a> {
// if current is invalid, try first step
.or_else(|| self.steps.first().copied().map(to_secs))
.map(|current| {
// special case to avoid Hard and Again showing same interval
if idx == 0 {
// if there is no next step, simulate one with twice the interval of `current`
let next = self
.secs_at_index(idx + 1)
.unwrap_or_else(|| current.saturating_mul(2));
maybe_round_in_days(current.saturating_add(next) / 2)
self.hard_delay_secs_for_first_step(current)
} else {
current
}
})
}
/// Special case the hard interval for the first step to avoid equality with the again interval.
/// Also ensure it's smaller than the good interval, at least with reasonable settings.
fn hard_delay_secs_for_first_step(self, again_secs: u32) -> u32 {
if let Some(next) = self.secs_at_index(1) {
// average of first (again) and second (good) steps
maybe_round_in_days(again_secs.saturating_add(next) / 2)
} else {
// 50% more than the again secs, but at most one day more
// otherwise, a learning step of 3 days and a graduating interval of 4 days e.g.
// would lead to the hard interval being larger than the good interval
let secs = (again_secs.saturating_mul(3) / 2).min(again_secs + DAY);
maybe_round_in_days(secs)
}
}
pub(crate) fn good_delay_secs(self, remaining: u32) -> Option<u32> {
let idx = self.get_index(remaining);
self.secs_at_index(idx + 1)
@ -106,7 +116,10 @@ mod test {
#[test]
fn delay_secs() {
// if no other step, hard delay is 50% above again secs
assert_delay_secs!([10.0], 1, 600, Some(900), None);
// but at most one day more than again secs
assert_delay_secs!([(3 * DAY / 60) as f32], 1, 3 * DAY, Some(4 * DAY), None);
assert_delay_secs!([1.0, 10.0], 2, 60, Some(330), Some(600));
assert_delay_secs!([1.0, 10.0], 1, 60, Some(600), None);