GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-11-11 15:17:12 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Update FSRS crate

Browse source
This commit is contained in:
Damien Elmes 2023-10-03 11:28:56 +10:00
parent 9fd8a8bb40
commit 257d7bbbbc
3 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Cargo.lock generated
View file

@ -573,7 +573,7 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
[[package]] [[package]]
name = "burn" name = "burn"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/burn-rs/burn.git?rev=d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c#d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c" source = "git+https://github.com/burn-rs/burn.git?rev=163e48c9699b2cc6d67fd7539cbf6821ecbf953b#163e48c9699b2cc6d67fd7539cbf6821ecbf953b"
dependencies = [ dependencies = [
"burn-core", "burn-core",
"burn-train", "burn-train",
@ -582,7 +582,7 @@ dependencies = [
[[package]] [[package]]
name = "burn-autodiff" name = "burn-autodiff"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/burn-rs/burn.git?rev=d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c#d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c" source = "git+https://github.com/burn-rs/burn.git?rev=163e48c9699b2cc6d67fd7539cbf6821ecbf953b#163e48c9699b2cc6d67fd7539cbf6821ecbf953b"
dependencies = [ dependencies = [
"burn-common", "burn-common",
"burn-tensor", "burn-tensor",
@ -594,9 +594,12 @@ dependencies = [
[[package]] [[package]]
name = "burn-common" name = "burn-common"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/burn-rs/burn.git?rev=d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c#d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c" source = "git+https://github.com/burn-rs/burn.git?rev=163e48c9699b2cc6d67fd7539cbf6821ecbf953b#163e48c9699b2cc6d67fd7539cbf6821ecbf953b"
dependencies = [ dependencies = [
"async-trait",
"const-random", "const-random",
"derive-new",
"getrandom 0.2.10",
"rand 0.8.5", "rand 0.8.5",
"spin 0.9.8", "spin 0.9.8",
"uuid", "uuid",
@ -605,7 +608,7 @@ dependencies = [
[[package]] [[package]]
name = "burn-core" name = "burn-core"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/burn-rs/burn.git?rev=d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c#d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c" source = "git+https://github.com/burn-rs/burn.git?rev=163e48c9699b2cc6d67fd7539cbf6821ecbf953b#163e48c9699b2cc6d67fd7539cbf6821ecbf953b"
dependencies = [ dependencies = [
"bincode", "bincode",
"burn-autodiff", "burn-autodiff",
@ -630,7 +633,7 @@ dependencies = [
[[package]] [[package]]
name = "burn-dataset" name = "burn-dataset"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/burn-rs/burn.git?rev=d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c#d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c" source = "git+https://github.com/burn-rs/burn.git?rev=163e48c9699b2cc6d67fd7539cbf6821ecbf953b#163e48c9699b2cc6d67fd7539cbf6821ecbf953b"
dependencies = [ dependencies = [
"csv 1.2.2", "csv 1.2.2",
"derive-new", "derive-new",
@ -649,7 +652,7 @@ dependencies = [
[[package]] [[package]]
name = "burn-derive" name = "burn-derive"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/burn-rs/burn.git?rev=d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c#d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c" source = "git+https://github.com/burn-rs/burn.git?rev=163e48c9699b2cc6d67fd7539cbf6821ecbf953b#163e48c9699b2cc6d67fd7539cbf6821ecbf953b"
dependencies = [ dependencies = [
"derive-new", "derive-new",
"proc-macro2", "proc-macro2",
@ -660,7 +663,7 @@ dependencies = [
[[package]] [[package]]
name = "burn-ndarray" name = "burn-ndarray"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/burn-rs/burn.git?rev=d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c#d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c" source = "git+https://github.com/burn-rs/burn.git?rev=163e48c9699b2cc6d67fd7539cbf6821ecbf953b#163e48c9699b2cc6d67fd7539cbf6821ecbf953b"
dependencies = [ dependencies = [
"burn-autodiff", "burn-autodiff",
"burn-common", "burn-common",
@ -678,8 +681,9 @@ dependencies = [
[[package]] [[package]]
name = "burn-tensor" name = "burn-tensor"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/burn-rs/burn.git?rev=d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c#d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c" source = "git+https://github.com/burn-rs/burn.git?rev=163e48c9699b2cc6d67fd7539cbf6821ecbf953b#163e48c9699b2cc6d67fd7539cbf6821ecbf953b"
dependencies = [ dependencies = [
"burn-common",
"burn-tensor-testgen", "burn-tensor-testgen",
"derive-new", "derive-new",
"half 2.3.1", "half 2.3.1",
@ -694,7 +698,7 @@ dependencies = [
[[package]] [[package]]
name = "burn-tensor-testgen" name = "burn-tensor-testgen"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/burn-rs/burn.git?rev=d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c#d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c" source = "git+https://github.com/burn-rs/burn.git?rev=163e48c9699b2cc6d67fd7539cbf6821ecbf953b#163e48c9699b2cc6d67fd7539cbf6821ecbf953b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -704,7 +708,7 @@ dependencies = [
[[package]] [[package]]
name = "burn-train" name = "burn-train"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/burn-rs/burn.git?rev=d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c#d06cc2f239c53e7f88dad7e0b2bbe6757a17d66c" source = "git+https://github.com/burn-rs/burn.git?rev=163e48c9699b2cc6d67fd7539cbf6821ecbf953b#163e48c9699b2cc6d67fd7539cbf6821ecbf953b"
dependencies = [ dependencies = [
"burn-core", "burn-core",
"derive-new", "derive-new",
@ -1505,7 +1509,7 @@ dependencies = [
[[package]] [[package]]
name = "fsrs" name = "fsrs"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/open-spaced-repetition/fsrs-rs.git?rev=5d67e1c0c82e56b49e3c9b3403da4ce703823b5f#5d67e1c0c82e56b49e3c9b3403da4ce703823b5f" source = "git+https://github.com/open-spaced-repetition/fsrs-rs.git?rev=ec622a0d1b058a8786cf506d170b7be438070394#ec622a0d1b058a8786cf506d170b7be438070394"
dependencies = [ dependencies = [
"burn", "burn",
"itertools 0.11.0", "itertools 0.11.0",
@ -1694,8 +1698,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"js-sys",
"libc", "libc",
"wasi 0.11.0+wasi-snapshot-preview1", "wasi 0.11.0+wasi-snapshot-preview1",
"wasm-bindgen",
] ]
[[package]] [[package]]

2
Cargo.toml
View file

@ -40,7 +40,7 @@ rev = "184b2ca50ed39ca43da13f0b830a463861adb9ca"
[workspace.dependencies.fsrs] [workspace.dependencies.fsrs]
git = "https://github.com/open-spaced-repetition/fsrs-rs.git" git = "https://github.com/open-spaced-repetition/fsrs-rs.git"
rev = "5d67e1c0c82e56b49e3c9b3403da4ce703823b5f" rev = "ec622a0d1b058a8786cf506d170b7be438070394"
# path = "../../../fsrs-rs" # path = "../../../fsrs-rs"
[workspace.dependencies] [workspace.dependencies]

2
rslib/src/scheduler/fsrs/memory_state.rs
View file

@ -140,7 +140,7 @@ impl Collection {
impl Card { impl Card {
pub(crate) fn set_memory_state(&mut self, fsrs: &FSRS, item: Option<FSRSItem>) { pub(crate) fn set_memory_state(&mut self, fsrs: &FSRS, item: Option<FSRSItem>) {
self.memory_state = item self.memory_state = item
.map(|i| fsrs.memory_state(i)) .map(|i| fsrs.memory_state(i, None))
.or_else(|| { .or_else(|| {
if self.ctype == CardType::New { if self.ctype == CardType::New {
None None