src/sliding_pdps.rs

changeset 81
642141008293
parent 78
2a122736e91c
child 83
66b8ac0ebe00
--- 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;

mercurial