src/pdps.rs

branch
dev
changeset 39
6316d68b58af
parent 37
c5d8bd1a7728
--- a/src/pdps.rs	Thu Jan 23 23:35:28 2025 +0100
+++ b/src/pdps.rs	Thu Jan 23 23:34:05 2025 +0100
@@ -80,6 +80,8 @@
     L2Squared,
     L1
 };
+use crate::measures::merging::SpikeMergingMethod;
+
 
 /// Acceleration
 #[derive(Clone, Copy, Eq, PartialEq, Serialize, Deserialize, ValueEnum, Debug)]
@@ -135,12 +137,15 @@
 #[replace_float_literals(F::cast_from(literal))]
 impl<F : Float> Default for PDPSConfig<F> {
     fn default() -> Self {
-        let τ0 = 0.5;
+        let τ0 = 5.0;
         PDPSConfig {
             τ0,
             σ0 : 0.99/τ0,
             acceleration : Acceleration::Partial,
-            generic : Default::default(),
+            generic : FBGenericConfig {
+                merging : SpikeMergingMethod { enabled : true, ..Default::default() },
+                .. Default::default()
+            },
         }
     }
 }
@@ -285,7 +290,9 @@
 
         // Prune and possibly merge spikes
         if config.merge_now(&state) {
-            stats.merged += prox_penalty.merge_spikes(&mut μ, &mut τv, &μ_base, τ, ε, config, &reg);
+            stats.merged += prox_penalty.merge_spikes_no_fitness(
+                &mut μ, &mut τv, &μ_base, None, τ, ε, config, &reg,
+            );
         }
         stats.pruned += prune_with_stats(&mut μ);
 

mercurial