GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Fix first_rating_count & learn_cost (#2688)

Browse source 
* fix first_rating_count & learn_cost

* Update CONTRIBUTORS

* cargo clippy --fix

* cargo fmt
This commit is contained in:
Jarrett Ye 2023-09-27 16:31:40 +08:00 committed by GitHub
parent d2f392ff9f
commit 05499297e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
rslib/src/scheduler/fsrs/retention.rs
View file

@ -76,12 +76,15 @@ impl Collection {
let first_rating_count = revlogs let first_rating_count = revlogs
.iter() .iter()
.filter(|r| { .group_by(|r| r.cid)
r.review_kind == RevlogReviewKind::Learning .into_iter()
&& r.last_interval == 0 .map(|(_cid, group)| {
&& r.button_chosen >= 1 group
.into_iter()
.find(|r| r.review_kind == RevlogReviewKind::Learning && r.button_chosen >= 1)
}) })
.counts_by(|r| r.button_chosen); .filter(|r| r.is_some())
.counts_by(|r| r.unwrap().button_chosen);
let total_first = first_rating_count.values().sum::<usize>() as f64; let total_first = first_rating_count.values().sum::<usize>() as f64;
let first_rating_prob = if total_first > 0.0 { let first_rating_prob = if total_first > 0.0 {
let mut arr = [0.0; 4]; let mut arr = [0.0; 4];
@ -136,11 +139,10 @@ impl Collection {
let learn_cost = { let learn_cost = {
let revlogs_filter = revlogs let revlogs_filter = revlogs
.iter() .iter()
.filter(|r| r.review_kind == RevlogReviewKind::Learning && r.last_interval == 0) .filter(|r| r.review_kind == RevlogReviewKind::Learning && r.button_chosen >= 1)
.map(|r| r.taken_millis); .map(|r| r.taken_millis);
let count = revlogs_filter.clone().count() as f64; if total_first > 0.0 {
if count > 0.0 { revlogs_filter.sum::<u32>() as f64 / total_first / 1000.0
revlogs_filter.sum::<u32>() as f64 / count / 1000.0
} else { } else {
return Err(AnkiError::FsrsInsufficientData); return Err(AnkiError::FsrsInsufficientData);
} }