Mercurial > repos > pointsource_algs / changeset

--- a/src/fb.rs	Fri Jul 31 10:41:47 2026 -0500
+++ b/src/fb.rs	Fri Jul 31 19:09:39 2026 -0500
@@ -241,7 +241,7 @@
     }
 
     //postprocess(μ_prev, config, f)
-    postprocess(μ, config, |μ̃| f.apply(μ̃))
+    postprocess(μ, config, |μ̃| f.apply(μ̃) + reg.apply(μ̃))
 }
 
 /// Iteratively solve the pointsource localisation problem using inertial forward-backward splitting.

--- a/src/forward_pdps.rs	Fri Jul 31 10:41:47 2026 -0500
+++ b/src/forward_pdps.rs	Fri Jul 31 19:09:39 2026 -0500
@@ -297,6 +297,7 @@
     let fit = |μ̃: &RNDM<N, F>| {
         f.apply(Pair(μ̃, &z)) /*+ fnR.apply(z) + reg.apply(μ)*/
         + fnH.apply(/* opKμ.apply(&μ̃) + */ opKz.apply(&z))
+        + reg.apply(μ̃)
     };
 
     μ.merge_spikes_fitness(config.insertion.final_merging_method(), fit, |&v| v);

--- a/src/sliding_fb.rs	Fri Jul 31 10:41:47 2026 -0500
+++ b/src/sliding_fb.rs	Fri Jul 31 19:09:39 2026 -0500
@@ -1159,7 +1159,7 @@
     }
 
     //postprocess(μ, &config.insertion, f)
-    postprocess(μ, &config.insertion, |μ̃| f.apply(μ̃))
+    postprocess(μ, &config.insertion, |μ̃| f.apply(μ̃) + reg.apply(μ̃))
 }
 
 #[deprecated]

--- a/src/sliding_pdps.rs	Fri Jul 31 10:41:47 2026 -0500
+++ b/src/sliding_pdps.rs	Fri Jul 31 19:09:39 2026 -0500
@@ -372,6 +372,7 @@
     let fit = |μ̃: &RNDM<N, F>| {
         f.apply(Pair(μ̃, &z)) /*+ fnR.apply(z) + reg.apply(μ)*/
         + fnH.apply(/* opKμ.apply(&μ̃) + */ opKz.apply(&z))
+        + reg.apply(μ̃)
     };
 
     μ.merge_spikes_fitness(config.insertion.final_merging_method(), fit, |&v| v);