Mercurial > repos > pointsource_algs / changeset

--- a/src/run.rs	Sat Feb 01 16:47:11 2025 -0500
+++ b/src/run.rs	Sun Feb 02 15:21:16 2025 -0500
@@ -170,7 +170,7 @@
         let override_transport = |g : TransportConfig<F>| {
             TransportConfig {
                 θ0 : cli.theta0.unwrap_or(g.θ0),
-                tolerance_mult_pos: cli.transport_tolerance_pos.unwrap_or(g.tolerance_mult_pos),
+                tolerance_mult_con: cli.transport_tolerance_pos.unwrap_or(g.tolerance_mult_con),
                 adaptation: cli.transport_adaptation.unwrap_or(g.adaptation),
                 .. g
             }

--- a/src/sliding_fb.rs	Sat Feb 01 16:47:11 2025 -0500
+++ b/src/sliding_fb.rs	Sun Feb 02 15:21:16 2025 -0500
@@ -49,7 +49,7 @@
     /// Factor in $(0, 1)$ for decreasing transport to adapt to tolerance.
     pub adaptation : F,
     /// A posteriori transport tolerance multiplier (C_pos)
-    pub tolerance_mult_pos : F,
+    pub tolerance_mult_con : F,
 }
 
 #[replace_float_literals(F::cast_from(literal))]
@@ -58,7 +58,7 @@
     pub fn check(&self) {
         assert!(self.θ0 > 0.0);
         assert!(0.0 < self.adaptation && self.adaptation < 1.0);
-        assert!(self.tolerance_mult_pos > 0.0);
+        assert!(self.tolerance_mult_con > 0.0);
     }
 }
 
@@ -68,7 +68,7 @@
         TransportConfig {
             θ0 : 0.9,
             adaptation : 0.9,
-            tolerance_mult_pos : 100.0,
+            tolerance_mult_con : 100.0,
         }
     }
 }
@@ -237,7 +237,7 @@
     //    which holds for some some C if the convolution kernel in 𝒟 has Lipschitz gradient.
     let nγ = γ1.norm(Radon);
     let nΔ = μ_base_minus_γ0.norm(Radon) + μ.dist_matching(&γ1) + extra.unwrap_or(0.0);
-    let t = ε * tconfig.tolerance_mult_pos;
+    let t = ε * tconfig.tolerance_mult_con;
     if nγ*nΔ > t {
         // Since t/(nγ*nΔ)<1, and the constant tconfig.adaptation < 1,
         // this will guarantee that eventually ‖γ‖ decreases sufficiently that we