Mercurial > repos > pointsource_algs / changeset

--- a/src/pdps.rs	Sun Jul 19 07:30:06 2026 +0200
+++ b/src/pdps.rs	Wed Jul 22 16:48:22 2026 -0500
@@ -109,7 +109,7 @@
     /// Accelerate if available
     pub acceleration: Acceleration,
     /// Generic parameters
-    pub generic: InsertionConfig<F>,
+    pub insertion: InsertionConfig<F>,
 }
 
 #[replace_float_literals(F::cast_from(literal))]
@@ -120,7 +120,7 @@
             τ0,
             σ0: 0.99 / τ0,
             acceleration: Acceleration::Partial,
-            generic: InsertionConfig {
+            insertion: InsertionConfig {
                 merging: SpikeMergingMethod { enabled: true, ..Default::default() },
                 ..Default::default()
             },
@@ -173,7 +173,7 @@
     let phistar = f.fidelity().conjugate();
 
     // Set up parameters
-    let config = &pdpsconfig.generic;
+    let config = &pdpsconfig.insertion;
     let l = prox_penalty.step_length_bound_pd(opA)?;
     let mut τ = pdpsconfig.τ0 / l;
     let mut σ = pdpsconfig.σ0 / l;

--- a/src/run.rs	Sun Jul 19 07:30:06 2026 +0200
+++ b/src/run.rs	Wed Jul 22 16:48:22 2026 -0500
@@ -171,7 +171,7 @@
                     τ0: cli.tau0.unwrap_or(pdps.τ0),
                     σ0: cli.sigma0.unwrap_or(pdps.σ0),
                     acceleration: cli.acceleration.unwrap_or(pdps.acceleration),
-                    generic: override_fb_generic(pdps.generic),
+                    insertion: override_fb_generic(pdps.insertion),
                     ..pdps
                 },
                 prox,
@@ -322,7 +322,7 @@
                 ProxTerm::RadonSquared,
             ),
             RadonPDPS => AlgorithmConfig::PDPS(
-                PDPSConfig { generic: radon_insertion, ..Default::default() },
+                PDPSConfig { insertion: radon_insertion, ..Default::default() },
                 ProxTerm::RadonSquared,
             ),
             RadonSlidingFB => AlgorithmConfig::SlidingFB(