# HG changeset patch
# User Tuomo Valkonen <tuomov@iki.fi>
# Date 1785301694 18000
# Node ID 642141008293f40de7b153765067c866ea14d649
# Parent  b6af27f7249236528598b3a3ff83f75b86518e50
Add regularisation term to merge fitness for scaling heuristic to be justified

diff -r b6af27f72492 -r 642141008293 Cargo.lock
--- a/Cargo.lock	Tue Jul 28 22:00:55 2026 -0500
+++ b/Cargo.lock	Wed Jul 29 00:08:14 2026 -0500
@@ -816,7 +816,7 @@
 
 [[package]]
 name = "pointsource_algs"
-version = "3.1.0-dev"
+version = "3.1.1"
 dependencies = [
  "GSL",
  "alg_tools",
diff -r b6af27f72492 -r 642141008293 Cargo.toml
--- a/Cargo.toml	Tue Jul 28 22:00:55 2026 -0500
+++ b/Cargo.toml	Wed Jul 29 00:08:14 2026 -0500
@@ -1,6 +1,6 @@
 [package]
 name = "pointsource_algs"
-version = "3.1.0"
+version = "3.1.1"
 edition = "2021"
 rust-version = "1.85"
 authors = ["Tuomo Valkonen <tuomov@iki.fi>"]
diff -r b6af27f72492 -r 642141008293 src/fb.rs
--- a/src/fb.rs	Tue Jul 28 22:00:55 2026 -0500
+++ b/src/fb.rs	Wed Jul 29 00:08:14 2026 -0500
@@ -210,7 +210,7 @@
                     ε,
                     ins,
                     &reg,
-                    Some(|μ̃: &RNDM<N, F>| f.apply(μ̃)),
+                    Some(|μ̃: &RNDM<N, F>| f.apply(μ̃) + reg.apply(μ̃)),
                 )
             });
         }
diff -r b6af27f72492 -r 642141008293 src/forward_pdps.rs
--- a/src/forward_pdps.rs	Tue Jul 28 22:00:55 2026 -0500
+++ b/src/forward_pdps.rs	Wed Jul 29 00:08:14 2026 -0500
@@ -249,7 +249,7 @@
                 ε,
                 ins,
                 &reg,
-                Some(|μ̃: &RNDM<N, F>| f.apply(Pair(μ̃, &z))),
+                Some(|μ̃: &RNDM<N, F>| f.apply(Pair(μ̃, &z))+ reg.apply(μ̃)),
             );
         });
 
diff -r b6af27f72492 -r 642141008293 src/sliding_fb.rs
--- a/src/sliding_fb.rs	Tue Jul 28 22:00:55 2026 -0500
+++ b/src/sliding_fb.rs	Wed Jul 29 00:08:14 2026 -0500
@@ -1101,7 +1101,7 @@
                 ε,
                 ins,
                 &reg,
-                Some(|μ̃: &RNDM<N, F>| f.apply(μ̃)),
+                Some(|μ̃: &RNDM<N, F>| f.apply(μ̃) + reg.apply(μ̃) ),
             );
             //if m > 0 {
             stats.merged += m;
diff -r b6af27f72492 -r 642141008293 src/sliding_pdps.rs
--- a/src/sliding_pdps.rs	Tue Jul 28 22:00:55 2026 -0500
+++ b/src/sliding_pdps.rs	Wed Jul 29 00:08:14 2026 -0500
@@ -14,6 +14,7 @@
 use crate::types::*;
 use alg_tools::bounds::MinMaxMapping;
 use alg_tools::convex::{Conjugable, Prox, Zero};
+use alg_tools::norms::L2;
 use alg_tools::direct_product::Pair;
 use alg_tools::error::DynResult;
 use alg_tools::euclidean::ClosedEuclidean;
@@ -23,7 +24,6 @@
 };
 use alg_tools::mapping::{DifferentiableMapping, DifferentiableRealMapping, Instance};
 use alg_tools::nalgebra_support::ToNalgebraRealField;
-use alg_tools::norms::L2;
 use anyhow::ensure;
 use numeric_literals::replace_float_literals;
 use serde::{Deserialize, Serialize};
@@ -312,7 +312,7 @@
                 ε,
                 ins,
                 &reg,
-                Some(|μ̃: &RNDM<N, F>| f.apply(Pair(μ̃, &z))),
+                Some(|μ̃: &RNDM<N, F>| f.apply(Pair(μ̃, &z)) + reg.apply(μ̃)),
             );
             if m > 0 {
                 stats.merged += m;