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

https://github.com/open-spaced-repetition/fsrs-rs/pull/355

Browse source
This commit is contained in:
Luc Mcgrady 2025-08-02 13:37:44 +01:00
parent d13c117e80
commit 62df837cf7
No known key found for this signature in database
GPG key ID: 4F3D7A0B17CC3D9C
4 changed files with 51 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Cargo.lock generated
View file

@ -130,7 +130,7 @@ dependencies = [
"prost", "prost",
"prost-reflect", "prost-reflect",
"pulldown-cmark 0.13.0", "pulldown-cmark 0.13.0",
"rand 0.9.1", "rand 0.9.2",
"rayon", "rayon",
"regex", "regex",
"reqwest 0.12.20", "reqwest 0.12.20",
@ -144,7 +144,7 @@ dependencies = [
"serde_tuple", "serde_tuple",
"sha1", "sha1",
"snafu", "snafu",
"strum 0.27.1", "strum 0.27.2",
"syn 2.0.103", "syn 2.0.103",
"tempfile", "tempfile",
"tokio", "tokio",
@ -220,7 +220,7 @@ dependencies = [
"prost-types", "prost-types",
"serde", "serde",
"snafu", "snafu",
"strum 0.27.1", "strum 0.27.2",
] ]
[[package]] [[package]]
@ -706,7 +706,7 @@ dependencies = [
"log", "log",
"num-traits", "num-traits",
"portable-atomic-util", "portable-atomic-util",
"rand 0.9.1", "rand 0.9.2",
"rmp-serde", "rmp-serde",
"serde", "serde",
"serde_json", "serde_json",
@ -732,7 +732,7 @@ dependencies = [
"hashbrown 0.15.4", "hashbrown 0.15.4",
"log", "log",
"num-traits", "num-traits",
"rand 0.9.1", "rand 0.9.2",
"serde", "serde",
"spin 0.10.0", "spin 0.10.0",
"text_placeholder", "text_placeholder",
@ -762,12 +762,12 @@ dependencies = [
"csv", "csv",
"derive-new 0.7.0", "derive-new 0.7.0",
"dirs 6.0.0", "dirs 6.0.0",
"rand 0.9.1", "rand 0.9.2",
"rmp-serde", "rmp-serde",
"sanitize-filename 0.6.0", "sanitize-filename 0.6.0",
"serde", "serde",
"serde_json", "serde_json",
"strum 0.27.1", "strum 0.27.2",
"tempfile", "tempfile",
"thiserror 2.0.12", "thiserror 2.0.12",
] ]
@ -817,7 +817,7 @@ dependencies = [
"num-traits", "num-traits",
"paste", "paste",
"portable-atomic-util", "portable-atomic-util",
"rand 0.9.1", "rand 0.9.2",
"seq-macro", "seq-macro",
"spin 0.10.0", "spin 0.10.0",
] ]
@ -865,7 +865,7 @@ dependencies = [
"half", "half",
"hashbrown 0.15.4", "hashbrown 0.15.4",
"num-traits", "num-traits",
"rand 0.9.1", "rand 0.9.2",
"rand_distr", "rand_distr",
"serde", "serde",
"serde_bytes", "serde_bytes",
@ -959,7 +959,7 @@ dependencies = [
"memmap2", "memmap2",
"num-traits", "num-traits",
"num_cpus", "num_cpus",
"rand 0.9.1", "rand 0.9.2",
"rand_distr", "rand_distr",
"rayon", "rayon",
"safetensors", "safetensors",
@ -1403,7 +1403,7 @@ dependencies = [
"log", "log",
"num-traits", "num-traits",
"portable-atomic", "portable-atomic",
"rand 0.9.1", "rand 0.9.2",
"sanitize-filename 0.5.0", "sanitize-filename 0.5.0",
"serde", "serde",
"serde_json", "serde_json",
@ -2214,20 +2214,19 @@ dependencies = [
[[package]] [[package]]
name = "fsrs" name = "fsrs"
version = "5.0.0" version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/open-spaced-repetition/fsrs-rs.git?branch=Feat/estimate-workload-for-cards#03e83fa66d86a4f60a2bb2e920b9c5cae9106b9d"
checksum = "f590cfcbe25079bb54a39900f45e6e308935bd6067249ce00d265b280465cde2"
dependencies = [ dependencies = [
"burn", "burn",
"itertools 0.14.0", "itertools 0.14.0",
"log", "log",
"ndarray", "ndarray",
"priority-queue", "priority-queue",
"rand 0.9.1", "rand 0.9.2",
"rayon", "rayon",
"serde", "serde",
"snafu", "snafu",
"strum 0.27.1", "strum 0.27.2",
] ]
[[package]] [[package]]
@ -2804,7 +2803,7 @@ dependencies = [
"cfg-if", "cfg-if",
"crunchy", "crunchy",
"num-traits", "num-traits",
"rand 0.9.1", "rand 0.9.2",
"rand_distr", "rand_distr",
"serde", "serde",
] ]
@ -3658,7 +3657,7 @@ dependencies = [
"linkcheck", "linkcheck",
"regex", "regex",
"reqwest 0.12.20", "reqwest 0.12.20",
"strum 0.27.1", "strum 0.27.2",
"tokio", "tokio",
] ]
@ -5096,7 +5095,7 @@ dependencies = [
"bytes", "bytes",
"getrandom 0.3.3", "getrandom 0.3.3",
"lru-slab", "lru-slab",
"rand 0.9.1", "rand 0.9.2",
"ring", "ring",
"rustc-hash 2.1.1", "rustc-hash 2.1.1",
"rustls", "rustls",
@ -5150,9 +5149,9 @@ dependencies = [
[[package]] [[package]]
name = "rand" name = "rand"
version = "0.9.1" version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
dependencies = [ dependencies = [
"rand_chacha 0.9.0", "rand_chacha 0.9.0",
"rand_core 0.9.3", "rand_core 0.9.3",
@ -5203,7 +5202,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a8615d50dcf34fa31f7ab52692afec947c4dd0ab803cc87cb3b0b4570ff7463" checksum = "6a8615d50dcf34fa31f7ab52692afec947c4dd0ab803cc87cb3b0b4570ff7463"
dependencies = [ dependencies = [
"num-traits", "num-traits",
"rand 0.9.1", "rand 0.9.2",
] ]
[[package]] [[package]]
@ -6113,9 +6112,9 @@ dependencies = [
[[package]] [[package]]
name = "strum" name = "strum"
version = "0.27.1" version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32" checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
dependencies = [ dependencies = [
"strum_macros 0.27.1", "strum_macros 0.27.1",
] ]

6
Cargo.toml
View file

@ -33,9 +33,9 @@ git = "https://github.com/ankitects/linkcheck.git"
rev = "184b2ca50ed39ca43da13f0b830a463861adb9ca" rev = "184b2ca50ed39ca43da13f0b830a463861adb9ca"
[workspace.dependencies.fsrs] [workspace.dependencies.fsrs]
version = "5.0.0" # version = "5.0.1"
# git = "https://github.com/open-spaced-repetition/fsrs-rs.git" git = "https://github.com/open-spaced-repetition/fsrs-rs.git"
# branch = "Refactor/expected_workload_via_dp" branch = "Feat/estimate-workload-for-cards"
# rev = "a7f7efc10f0a26b14ee348cc7402155685f2a24f" # rev = "a7f7efc10f0a26b14ee348cc7402155685f2a24f"
# path = "../open-spaced-repetition/fsrs-rs" # path = "../open-spaced-repetition/fsrs-rs"

15
rslib/src/deckconfig/service.rs
View file

@ -103,6 +103,7 @@ impl crate::services::DeckConfigService for Collection {
&mut self, &mut self,
input: anki_proto::deck_config::GetRetentionWorkloadRequest, input: anki_proto::deck_config::GetRetentionWorkloadRequest,
) -> Result<anki_proto::deck_config::GetRetentionWorkloadResponse> { ) -> Result<anki_proto::deck_config::GetRetentionWorkloadResponse> {
let days_elapsed = self.timing_today().unwrap().days_elapsed as i32;
let guard = let guard =
self.search_cards_into_table(&input.search, crate::search::SortMode::NoOrder)?; self.search_cards_into_table(&input.search, crate::search::SortMode::NoOrder)?;
@ -112,12 +113,24 @@ impl crate::services::DeckConfigService for Collection {
.get_revlog_entries_for_searched_cards_in_card_order()?; .get_revlog_entries_for_searched_cards_in_card_order()?;
let config = guard.col.get_optimal_retention_parameters(revlogs)?; let config = guard.col.get_optimal_retention_parameters(revlogs)?;
let cards = guard
.col
.storage
.all_searched_cards()?
.into_iter()
.filter_map(|c| crate::card::Card::convert(c.clone(), days_elapsed, c.memory_state?.clone()))
.collect::<Vec<fsrs::Card>>();
let costs = (70u32..=99u32) let costs = (70u32..=99u32)
.map(|dr| { .map(|dr| {
Ok(( Ok((
dr, dr,
fsrs::expected_workload(&input.w, dr as f32 / 100., &config)?, fsrs::expected_workload_with_existing_cards(
&input.w,
dr as f32 / 100.,
&config,
&cards,
)?,
)) ))
}) })
.collect::<Result<HashMap<_, _>>>()?; .collect::<Result<HashMap<_, _>>>()?;

17
rslib/src/scheduler/fsrs/simulator.rs
View file

@ -121,6 +121,12 @@ fn create_review_priority_fn(
} }
} }
pub(crate) fn is_included_card(c: &Card) -> bool {
c.queue != CardQueue::Suspended
&& c.queue != CardQueue::PreviewRepeat
&& c.ctype != CardType::New
}
impl Collection { impl Collection {
pub fn simulate_request_to_config( pub fn simulate_request_to_config(
&mut self, &mut self,
@ -133,11 +139,6 @@ impl Collection {
.get_revlog_entries_for_searched_cards_in_card_order()?; .get_revlog_entries_for_searched_cards_in_card_order()?;
let mut cards = guard.col.storage.all_searched_cards()?; let mut cards = guard.col.storage.all_searched_cards()?;
drop(guard); drop(guard);
fn is_included_card(c: &Card) -> bool {
c.queue != CardQueue::Suspended
&& c.queue != CardQueue::PreviewRepeat
&& c.ctype != CardType::New
}
// calculate any missing memory state // calculate any missing memory state
for c in &mut cards { for c in &mut cards {
if is_included_card(c) && c.memory_state.is_none() { if is_included_card(c) && c.memory_state.is_none() {
@ -306,7 +307,11 @@ impl Collection {
} }
impl Card { impl Card {
fn convert(card: Card, days_elapsed: i32, memory_state: FsrsMemoryState) -> Option<fsrs::Card> { pub(crate) fn convert(
card: Card,
days_elapsed: i32,
memory_state: FsrsMemoryState,
) -> Option<fsrs::Card> {
match card.queue { match card.queue {
CardQueue::DayLearn | CardQueue::Review => { CardQueue::DayLearn | CardQueue::Review => {
let due = card.original_or_current_due(); let due = card.original_or_current_due();