mirror of
https://github.com/ankitects/anki.git
synced 2025-09-18 14:02:21 -04:00
When not training, only create the final FSRS item
This commit is contained in:
parent
1afc7e35ca
commit
147da28a1f
1 changed files with 43 additions and 18 deletions
|
@ -478,7 +478,7 @@ pub(crate) fn reviews_for_fsrs(
|
||||||
}))
|
}))
|
||||||
.collect_vec();
|
.collect_vec();
|
||||||
|
|
||||||
let skip = if training { 1 } else { 0 };
|
let items = if training {
|
||||||
// Convert the remaining entries into separate FSRSItems, where each item
|
// Convert the remaining entries into separate FSRSItems, where each item
|
||||||
// contains all reviews done until then.
|
// contains all reviews done until then.
|
||||||
let mut items = Vec::with_capacity(entries.len());
|
let mut items = Vec::with_capacity(entries.len());
|
||||||
|
@ -488,13 +488,32 @@ pub(crate) fn reviews_for_fsrs(
|
||||||
rating: entry.button_chosen as u32,
|
rating: entry.button_chosen as u32,
|
||||||
delta_t,
|
delta_t,
|
||||||
});
|
});
|
||||||
if idx >= skip && (!training || current_reviews.last().unwrap().delta_t > 0) {
|
if idx >= 1 && delta_t > 0 {
|
||||||
let item = FSRSItem {
|
items.push((
|
||||||
|
entry.id,
|
||||||
|
FSRSItem {
|
||||||
reviews: current_reviews.clone(),
|
reviews: current_reviews.clone(),
|
||||||
|
},
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
items
|
||||||
|
} else {
|
||||||
|
// When not training, we only need the final FSRS item, which represents
|
||||||
|
// the complete history of the card. This avoids expensive clones in a loop.
|
||||||
|
let reviews = entries
|
||||||
|
.iter()
|
||||||
|
.zip(delta_ts.iter())
|
||||||
|
.map(|(entry, &delta_t)| FSRSReview {
|
||||||
|
rating: entry.button_chosen as u32,
|
||||||
|
delta_t,
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
let last_entry = entries.last().unwrap();
|
||||||
|
|
||||||
|
vec![(last_entry.id, FSRSItem { reviews })]
|
||||||
};
|
};
|
||||||
items.push((entry.id, item));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if items.is_empty() {
|
if items.is_empty() {
|
||||||
None
|
None
|
||||||
} else {
|
} else {
|
||||||
|
@ -734,7 +753,7 @@ pub(crate) mod tests {
|
||||||
],
|
],
|
||||||
false,
|
false,
|
||||||
),
|
),
|
||||||
fsrs_items!([review(0)], [review(0), review(1)])
|
fsrs_items!([review(0), review(1)])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -805,7 +824,7 @@ pub(crate) mod tests {
|
||||||
// R | A X R
|
// R | A X R
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
convert_ignore_before(revlogs, false, days_ago_ms(9)),
|
convert_ignore_before(revlogs, false, days_ago_ms(9)),
|
||||||
fsrs_items!([review(0)], [review(0), review(2)])
|
fsrs_items!([review(0), review(2)])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -824,6 +843,9 @@ pub(crate) mod tests {
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
convert_ignore_before(revlogs, false, days_ago_ms(9))
|
convert_ignore_before(revlogs, false, days_ago_ms(9))
|
||||||
.unwrap()
|
.unwrap()
|
||||||
|
.last()
|
||||||
|
.unwrap()
|
||||||
|
.reviews
|
||||||
.len(),
|
.len(),
|
||||||
2
|
2
|
||||||
);
|
);
|
||||||
|
@ -845,6 +867,9 @@ pub(crate) mod tests {
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
convert_ignore_before(revlogs, false, days_ago_ms(9))
|
convert_ignore_before(revlogs, false, days_ago_ms(9))
|
||||||
.unwrap()
|
.unwrap()
|
||||||
|
.last()
|
||||||
|
.unwrap()
|
||||||
|
.reviews
|
||||||
.len(),
|
.len(),
|
||||||
2
|
2
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue