mirror of
https://github.com/ankitects/anki.git
synced 2026-01-13 22:13:58 -05:00
replace days_since_last_review with seconds_since_last_review
This commit is contained in:
parent
df939c5574
commit
aecff39b6f
2 changed files with 3 additions and 20 deletions
|
|
@ -127,23 +127,6 @@ impl Card {
|
||||||
|
|
||||||
/// This uses card.due and card.ivl to infer the elapsed time. If 'set due
|
/// This uses card.due and card.ivl to infer the elapsed time. If 'set due
|
||||||
/// date' or an add-on has changed the due date, this won't be accurate.
|
/// date' or an add-on has changed the due date, this won't be accurate.
|
||||||
pub(crate) fn days_since_last_review(&self, timing: &SchedTimingToday) -> Option<u32> {
|
|
||||||
if let Some(last_review_time) = self.last_review_time {
|
|
||||||
Some(timing.next_day_at.elapsed_days_since(last_review_time) as u32)
|
|
||||||
} else if !self.is_due_in_days() {
|
|
||||||
Some(
|
|
||||||
(timing.next_day_at.0 as u32).saturating_sub(self.original_or_current_due() as u32)
|
|
||||||
/ 86_400,
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
self.due_time(timing).map(|due| {
|
|
||||||
(due.adding_secs(-86_400 * self.interval as i64)
|
|
||||||
.elapsed_secs()
|
|
||||||
/ 86_400) as u32
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) fn seconds_since_last_review(&self, timing: &SchedTimingToday) -> Option<u32> {
|
pub(crate) fn seconds_since_last_review(&self, timing: &SchedTimingToday) -> Option<u32> {
|
||||||
if let Some(last_review_time) = self.last_review_time {
|
if let Some(last_review_time) = self.last_review_time {
|
||||||
Some(timing.now.elapsed_secs_since(last_review_time) as u32)
|
Some(timing.now.elapsed_secs_since(last_review_time) as u32)
|
||||||
|
|
|
||||||
|
|
@ -30,10 +30,10 @@ impl GraphsContext {
|
||||||
.or_insert((0.0, 0));
|
.or_insert((0.0, 0));
|
||||||
entry.1 += 1;
|
entry.1 += 1;
|
||||||
if let Some(state) = card.memory_state {
|
if let Some(state) = card.memory_state {
|
||||||
let elapsed_days = card.days_since_last_review(&timing).unwrap_or_default();
|
let elapsed_seconds = card.seconds_since_last_review(&timing).unwrap_or_default();
|
||||||
let r = fsrs.current_retrievability(
|
let r = fsrs.current_retrievability_seconds(
|
||||||
state.into(),
|
state.into(),
|
||||||
elapsed_days,
|
elapsed_seconds,
|
||||||
card.decay.unwrap_or(FSRS5_DEFAULT_DECAY),
|
card.decay.unwrap_or(FSRS5_DEFAULT_DECAY),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue