Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat/FSRS-5 #197

Merged
merged 15 commits into from
Jul 14, 2024
Merged

Feat/FSRS-5 #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ea6b46c
don't remove short term reviews
L-M-Sherlock Jul 10, 2024
2040c57
update create_pretrain_data
L-M-Sherlock Jul 11, 2024
86ad8b9
update training & model
L-M-Sherlock Jul 11, 2024
a0847e2
update simulator
L-M-Sherlock Jul 11, 2024
9e45779
cargo clippy
L-M-Sherlock Jul 11, 2024
bc3619c
bump version
L-M-Sherlock Jul 11, 2024
52c2a0a
fix overflow of usize
L-M-Sherlock Jul 11, 2024
cf0186e
states should be changed in short term
L-M-Sherlock Jul 11, 2024
36bbeb7
*y = if x { t1 } else { t2 }
L-M-Sherlock Jul 12, 2024
698cdd6
Merge branch 'main' into Feat/FSRS-5
L-M-Sherlock Jul 14, 2024
19c251a
make extract_simulation_config public
L-M-Sherlock Jul 14, 2024
a3e695e
cargo clippy --fix
L-M-Sherlock Jul 14, 2024
3bda902
cargo fmt
L-M-Sherlock Jul 14, 2024
c7c578a
update parameters from FSRS-4.5
L-M-Sherlock Jul 14, 2024
c966443
cargo fmt
L-M-Sherlock Jul 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fsrs"
version = "0.6.4"
version = "1.0.0"
authors = ["Open Spaced Repetition"]
categories = ["algorithms", "science"]
edition = "2021"
Expand Down
4 changes: 2 additions & 2 deletions benches/benchmark.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ pub(crate) fn next_states(inf: &FSRS) -> NextStates {
.unwrap()
}

pub(crate) fn optimal_retention(inf: &FSRS, config: &SimulatorConfig) -> f64 {
pub(crate) fn optimal_retention(inf: &FSRS, config: &SimulatorConfig) -> f32 {
inf.optimal_retention(config, &[], |_v| true).unwrap()
}

Expand Down Expand Up @@ -63,7 +63,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
let config = SimulatorConfig {
deck_size: 3650,
learn_span: 365,
max_cost_perday: f64::INFINITY,
max_cost_perday: f32::INFINITY,
learn_limit: 10,
loss_aversion: 1.0,
..Default::default()
Expand Down
148 changes: 94 additions & 54 deletions src/batch_shuffle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,164 +280,204 @@ mod tests {
[
FSRSItem {
reviews: vec![
FSRSReview {
rating: 1,
delta_t: 0
},
FSRSReview {
rating: 4,
delta_t: 0,
delta_t: 0
},
FSRSReview {
rating: 3,
delta_t: 1,
rating: 4,
delta_t: 0
},
FSRSReview {
rating: 3,
delta_t: 3,
rating: 4,
delta_t: 1
}
]
},
FSRSItem {
reviews: vec![
FSRSReview {
rating: 1,
delta_t: 0,
rating: 4,
delta_t: 0
},
FSRSReview {
rating: 3,
delta_t: 1,
rating: 4,
delta_t: 0
},
FSRSReview {
rating: 4,
delta_t: 1
},
FSRSReview {
rating: 3,
delta_t: 3,
delta_t: 2
}
],
]
},
FSRSItem {
reviews: vec![
FSRSReview {
rating: 1,
delta_t: 0,
rating: 4,
delta_t: 0
},
FSRSReview {
rating: 3,
delta_t: 1,
rating: 4,
delta_t: 0
},
FSRSReview {
rating: 4,
delta_t: 1
},
FSRSReview {
rating: 3,
delta_t: 3,
delta_t: 1
}
],
]
},
FSRSItem {
reviews: vec![
FSRSReview {
rating: 1,
delta_t: 0,
delta_t: 0
},
FSRSReview {
rating: 3,
delta_t: 1,
rating: 4,
delta_t: 0
},
FSRSReview {
rating: 3,
delta_t: 3,
rating: 4,
delta_t: 0
},
FSRSReview {
rating: 4,
delta_t: 1
}
],
]
},
FSRSItem {
reviews: vec![
FSRSReview {
rating: 1,
delta_t: 0,
rating: 4,
delta_t: 0
},
FSRSReview {
rating: 3,
delta_t: 1,
rating: 4,
delta_t: 0
},
FSRSReview {
rating: 4,
delta_t: 1
},
FSRSReview {
rating: 3,
delta_t: 3,
delta_t: 1
}
],
]
},
FSRSItem {
reviews: vec![
FSRSReview {
rating: 1,
delta_t: 0
},
FSRSReview {
rating: 4,
delta_t: 0,
delta_t: 0
},
FSRSReview {
rating: 4,
delta_t: 3,
delta_t: 0
},
FSRSReview {
rating: 3,
delta_t: 10,
rating: 4,
delta_t: 1
}
],
]
},
FSRSItem {
reviews: vec![
FSRSReview {
rating: 4,
delta_t: 0,
delta_t: 0
},
FSRSReview {
rating: 4,
delta_t: 0
},
FSRSReview {
rating: 4,
delta_t: 1,
delta_t: 1
},
FSRSReview {
rating: 3,
delta_t: 4,
delta_t: 3
}
],
]
},
FSRSItem {
reviews: vec![
FSRSReview {
rating: 4,
delta_t: 0,
delta_t: 0
},
FSRSReview {
rating: 4,
delta_t: 0
},
FSRSReview {
rating: 4,
delta_t: 1,
delta_t: 1
},
FSRSReview {
rating: 3,
delta_t: 4,
delta_t: 1
}
],
]
},
FSRSItem {
reviews: vec![
FSRSReview {
rating: 4,
delta_t: 0,
delta_t: 0
},
FSRSReview {
rating: 3,
delta_t: 5,
rating: 4,
delta_t: 0
},
FSRSReview {
rating: 4,
delta_t: 1
},
FSRSReview {
rating: 3,
delta_t: 11,
delta_t: 2
}
],
]
},
FSRSItem {
reviews: vec![
FSRSReview {
rating: 3,
delta_t: 0
},
FSRSReview {
rating: 4,
delta_t: 0,
delta_t: 0
},
FSRSReview {
rating: 3,
delta_t: 1,
rating: 4,
delta_t: 0
},
FSRSReview {
rating: 3,
delta_t: 3,
rating: 4,
delta_t: 1
}
],
},
]
}
]
);
}
Expand Down
Loading
Loading