src/prox_penalty/wave.rs

changeset 76
b921ed0ab99b
parent 75
677a5fd1b014
--- a/src/prox_penalty/wave.rs	Sun Jul 19 07:30:06 2026 +0200
+++ b/src/prox_penalty/wave.rs	Mon Jul 13 12:09:57 2026 -0500
@@ -106,11 +106,7 @@
             // If no merging heuristic is used, let's be more conservative about spike insertion,
             // and skip it after first round. If merging is done, being more greedy about spike
             // insertion also seems to improve performance.
-            let skip_by_rough_check = if config.merging.enabled {
-                false
-            } else {
-                count > 0
-            };
+            let skip_by_rough_check = config.conservative && (!config.merging.enabled || count > 0);
 
             // Find a spike to insert, if needed
             let (ξ, _v_ξ, in_bounds) =

mercurial