Merge branch 'main' into Feat/option-enable_short_term-in-training-

L-M-Sherlock · web-flow · commit d58de6032f6e · 2024-12-19T11:46:11.000+08:00
diff --git a/src/optimal_retention.rs b/src/optimal_retention.rs
@@ -82,8 +82,11 @@ fn stability_after_success(w: &[f32], s: f32, r: f32, d: f32, rating: usize) ->
 }
 
 fn stability_after_failure(w: &[f32], s: f32, r: f32, d: f32) -> f32 {
-    (w[11] * d.powf(-w[12]) * ((s + 1.0).powf(w[13]) - 1.0) * f32::exp((1.0 - r) * w[14]))
-        .clamp(S_MIN, s / (w[17] * w[18]).exp())
+    let new_s_min = s / (w[17] * w[18]).exp();
+    let new_s =
+        (w[11] * d.powf(-w[12]) * ((s + 1.0).powf(w[13]) - 1.0) * f32::exp((1.0 - r) * w[14]))
+            .min(new_s_min);
+    new_s.clamp(S_MIN, S_MAX)
 }
 
 fn stability_short_term(w: &[f32], s: f32, rating_offset: f32, session_len: f32) -> f32 {

Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,11 @@ fn stability_after_success(w: &[f32], s: f32, r: f32, d: f32, rating: usize) ->`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`fn stability_after_failure(w: &[f32], s: f32, r: f32, d: f32) -> f32 {`
`85`		`- (w[11] * d.powf(-w[12]) * ((s + 1.0).powf(w[13]) - 1.0) * f32::exp((1.0 - r) * w[14]))`
`86`		`- .clamp(S_MIN, s / (w[17] * w[18]).exp())`
	`85`	`+ let new_s_min = s / (w[17] * w[18]).exp();`
	`86`	`+ let new_s =`
	`87`	`+ (w[11] * d.powf(-w[12]) * ((s + 1.0).powf(w[13]) - 1.0) * f32::exp((1.0 - r) * w[14]))`
	`88`	`+ .min(new_s_min);`
	`89`	`+ new_s.clamp(S_MIN, S_MAX)`
`87`	`90`	`}`
`88`	`91`
`89`	`92`	`fn stability_short_term(w: &[f32], s: f32, rating_offset: f32, session_len: f32) -> f32 {`