# HG changeset patch # User Tuomo Valkonen # Date 1786032855 18000 # Node ID 8f1e57821d7657eb4ab09ac6c05492f6fc742c2a # Parent 759634edb5365efdac7b6241126c98a4ca6fe950 Generalise algorithms to arbitrary domains diff -r 759634edb536 -r 8f1e57821d76 src/domain.rs --- a/src/domain.rs Tue Aug 04 20:11:10 2026 -0500 +++ b/src/domain.rs Thu Aug 06 11:14:15 2026 -0500 @@ -28,7 +28,7 @@ } } -impl AdmissibleDomain> for FullSpace {} +impl AdmissibleDomain for FullSpace {} pub struct UniformRandom(pub S, pub R); diff -r 759634edb536 -r 8f1e57821d76 src/fb.rs --- a/src/fb.rs Tue Aug 04 20:11:10 2026 -0500 +++ b/src/fb.rs Thu Aug 06 11:14:15 2026 -0500 @@ -79,7 +79,7 @@ use crate::domain::{AdmissibleDomain, FullSpace}; use crate::measures::merging::SpikeMerging; -use crate::measures::{DiscreteMeasure, RNDM}; +use crate::measures::DiscreteMeasure; use crate::plot::Plotter; pub use crate::prox_penalty::{InsertionConfig, ProxPenalty, StepLengthBound}; use crate::regularisation::RegTerm; @@ -87,6 +87,7 @@ use alg_tools::error::DynResult; use alg_tools::instance::Instance; use alg_tools::iterate::AlgIteratorFactory; +use alg_tools::linops::Space; use alg_tools::mapping::DifferentiableMapping; use alg_tools::nalgebra_support::ToNalgebraRealField; use colored::Colorize; @@ -113,8 +114,8 @@ } } -pub(crate) fn prune_with_stats( - μ: &mut RNDM, +pub(crate) fn prune_with_stats( + μ: &mut DiscreteMeasure, until: usize, ) -> usize { let n_before_prune = μ.len(); @@ -124,14 +125,16 @@ } #[replace_float_literals(F::cast_from(literal))] -pub(crate) fn postprocess) -> F, const N: usize>( - mut μ: RNDM, +pub(crate) fn postprocess( + mut μ: DiscreteMeasure, config: &InsertionConfig, f: Dat, -) -> DynResult> +) -> DynResult> where - RNDM: SpikeMerging, - for<'a> &'a RNDM: Instance>, + Dat: Fn(&DiscreteMeasure) -> F, + U: Space + Clone, + DiscreteMeasure: SpikeMerging, + for<'a> &'a DiscreteMeasure: Instance>, { //μ.merge_spikes_fitness(config.final_merging_method(), |μ̃| f.apply(μ̃), |&v| v); μ.merge_spikes_fitness(config.final_merging_method(), f, |&v| v); @@ -151,25 +154,26 @@ /// /// Returns the final iterate. #[replace_float_literals(F::cast_from(literal))] -pub fn pointsource_fb_dom( +pub fn pointsource_fb_dom( f: &Dat, reg: &Reg, prox_penalty: &P, fbconfig: &FBConfig, iterator: I, mut plotter: Plot, - μ0: Option>, - domain: &mut impl AdmissibleDomain>, -) -> DynResult> + μ0: Option>, + domain: &mut impl AdmissibleDomain, +) -> DynResult> where + U: Space + Clone, F: Float + ToNalgebraRealField, I: AlgIteratorFactory>, - RNDM: SpikeMerging, - Dat: DifferentiableMapping, Codomain = F>, + DiscreteMeasure: SpikeMerging, + Dat: DifferentiableMapping, Codomain = F>, Dat::DerivativeDomain: ClosedMul, - Reg: RegTerm, F>, - P: ProxPenalty, Dat::DerivativeDomain, Reg, F> + StepLengthBound, - Plot: Plotter>, + Reg: RegTerm, + P: ProxPenalty + StepLengthBound, + Plot: Plotter>, { // Set up parameters let config = &fbconfig.insertion; @@ -183,7 +187,7 @@ let mut μ = μ0.unwrap_or_else(|| DiscreteMeasure::new()); // Statistics - let full_stats = |μ: &RNDM, ε, stats| IterInfo { + let full_stats = |μ: &DiscreteMeasure, ε, stats| IterInfo { value: f.apply(μ) + reg.apply(μ), n_spikes: μ.len(), ε, @@ -219,7 +223,7 @@ ε, ins, ®, - Some(|μ̃: &RNDM| f.apply(μ̃) + reg.apply(μ̃)), + Some(|μ̃: &DiscreteMeasure| f.apply(μ̃) + reg.apply(μ̃)), ); // Prune. Do not prune new insertions on first round. @@ -267,24 +271,25 @@ } #[deprecated] -pub fn pointsource_fb_reg( +pub fn pointsource_fb_reg( f: &Dat, reg: &Reg, prox_penalty: &P, fbconfig: &FBConfig, iterator: I, plotter: Plot, - μ0: Option>, -) -> DynResult> + μ0: Option>, +) -> DynResult> where + U: Space + Clone, F: Float + ToNalgebraRealField, I: AlgIteratorFactory>, - RNDM: SpikeMerging, - Dat: DifferentiableMapping, Codomain = F>, + DiscreteMeasure: SpikeMerging, + Dat: DifferentiableMapping, Codomain = F>, Dat::DerivativeDomain: ClosedMul, - Reg: RegTerm, F>, - P: ProxPenalty, Dat::DerivativeDomain, Reg, F> + StepLengthBound, - Plot: Plotter>, + Reg: RegTerm, + P: ProxPenalty + StepLengthBound, + Plot: Plotter>, { pointsource_fb_dom( f, @@ -310,24 +315,25 @@ /// /// Returns the final iterate. #[replace_float_literals(F::cast_from(literal))] -pub fn pointsource_fista_reg( +pub fn pointsource_fista_reg( f: &Dat, reg: &Reg, prox_penalty: &P, fbconfig: &FBConfig, iterator: I, mut plotter: Plot, - μ0: Option>, -) -> DynResult> + μ0: Option>, +) -> DynResult> where + U: Space + Clone, F: Float + ToNalgebraRealField, I: AlgIteratorFactory>, - RNDM: SpikeMerging, - Dat: DifferentiableMapping, Codomain = F>, + DiscreteMeasure: SpikeMerging, + Dat: DifferentiableMapping, Codomain = F>, Dat::DerivativeDomain: ClosedMul, - Reg: RegTerm, F>, - P: ProxPenalty, Dat::DerivativeDomain, Reg, F> + StepLengthBound, - Plot: Plotter>, + Reg: RegTerm, + P: ProxPenalty + StepLengthBound, + Plot: Plotter>, { // Set up parameters let config = &fbconfig.insertion; @@ -344,7 +350,7 @@ let mut warned_merging = false; // Statistics - let full_stats = |ν: &RNDM, ε, stats| IterInfo { + let full_stats = |ν: &DiscreteMeasure, ε, stats| IterInfo { value: f.apply(ν) + reg.apply(ν), n_spikes: ν.len(), ε, diff -r 759634edb536 -r 8f1e57821d76 src/forward_pdps.rs --- a/src/forward_pdps.rs Tue Aug 04 20:11:10 2026 -0500 +++ b/src/forward_pdps.rs Thu Aug 06 11:14:15 2026 -0500 @@ -6,7 +6,7 @@ use crate::domain::{AdmissibleDomain, FullSpace}; use crate::fb::*; use crate::measures::merging::SpikeMerging; -use crate::measures::{DiscreteMeasure, RNDM}; +use crate::measures::DiscreteMeasure; use crate::plot::Plotter; use crate::prox_penalty::{ProxPenalty, StepLengthBoundPair}; use crate::regularisation::RegTerm; @@ -16,8 +16,8 @@ use alg_tools::error::DynResult; use alg_tools::euclidean::ClosedEuclidean; use alg_tools::iterate::AlgIteratorFactory; -use alg_tools::linops::{BoundedLinear, IdOp, SimplyAdjointable, ZeroOp, AXPY, GEMV}; -use alg_tools::mapping::{DifferentiableMapping, DifferentiableRealMapping, Instance}; +use alg_tools::linops::{BoundedLinear, IdOp, SimplyAdjointable, Space, ZeroOp, AXPY, GEMV}; +use alg_tools::mapping::{DifferentiableMapping, Instance}; use alg_tools::nalgebra_support::ToNalgebraRealField; use alg_tools::norms::L2; use anyhow::ensure; @@ -48,7 +48,7 @@ } } -type MeasureZ = Pair, Z>; +type MeasureZ = Pair, Z>; /// Iteratively solve the pointsource localisation with an additional variable /// using primal-dual proximal splitting with a forward step. @@ -89,6 +89,7 @@ #[replace_float_literals(F::cast_from(literal))] pub fn pointsource_forward_pdps_pair_dom< F, + U, I, S, Dat, @@ -100,7 +101,6 @@ /*KOpM, */ KOpZ, H, Plot, - const N: usize, >( f: &Dat, reg: &Reg, @@ -108,22 +108,23 @@ config: &ForwardPDPSConfig, iterator: I, mut plotter: Plot, - (μ0, mut z, mut y): (Option>, Z, Y), + (μ0, mut z, mut y): (Option>, Z, Y), //opKμ : KOpM, opKz: &KOpZ, fnR: &R, fnH: &H, - domain: &mut impl AdmissibleDomain>, -) -> DynResult> + domain: &mut impl AdmissibleDomain, +) -> DynResult> where + U: Space + Clone, F: Float + ToNalgebraRealField, I: AlgIteratorFactory>, - Dat: DifferentiableMapping, Codomain = F, DerivativeDomain = Pair>, + Dat: DifferentiableMapping, Codomain = F, DerivativeDomain = Pair>, //Pair: ClosedMul, // Doesn't really need to be closed, if make this signature more complex… - S: DifferentiableRealMapping + ClosedMul, - RNDM: SpikeMerging, - Reg: RegTerm, F>, - P: ProxPenalty, S, Reg, F>, + S: ClosedMul, + DiscreteMeasure: SpikeMerging, + Reg: RegTerm, + P: ProxPenalty, for<'a> Pair<&'a P, &'a IdOp>: StepLengthBoundPair, KOpZ: BoundedLinear + GEMV @@ -136,7 +137,7 @@ R: Prox, H: Conjugable, for<'b> H::Conjugate<'b>: Prox, - Plot: Plotter>, + Plot: Plotter>, { // Check parameters ensure!( @@ -188,7 +189,7 @@ let starH = fnH.conjugate(); // Statistics - let full_stats = |μ: &RNDM, z: &Z, ε, stats| IterInfo { + let full_stats = |μ: &DiscreteMeasure, z: &Z, ε, stats| IterInfo { value: f.apply(Pair(μ, z)) + fnR.apply(z) + reg.apply(μ) @@ -250,7 +251,7 @@ ε, ins, ®, - Some(|μ̃: &RNDM| f.apply(Pair(μ̃, &z)) + reg.apply(μ̃)), + Some(|μ̃: &DiscreteMeasure| f.apply(Pair(μ̃, &z)) + reg.apply(μ̃)), ); // Prune. Do not prune new insertions on first round. stats.pruned += prune_with_stats(&mut μ, μ_base_len); @@ -310,7 +311,7 @@ ε = tolerance.update(ε, iter); } - let fit = |μ̃: &RNDM| { + let fit = |μ̃: &DiscreteMeasure| { f.apply(Pair(μ̃, &z)) /*+ fnR.apply(z) + reg.apply(μ)*/ + fnH.apply(/* opKμ.apply(&μ̃) + */ opKz.apply(&z)) + reg.apply(μ̃) @@ -324,6 +325,7 @@ #[deprecated] pub fn pointsource_forward_pdps_pair< F, + U, I, S, Dat, @@ -335,7 +337,6 @@ /*KOpM, */ KOpZ, H, Plot, - const N: usize, >( f: &Dat, reg: &Reg, @@ -343,21 +344,22 @@ config: &ForwardPDPSConfig, iterator: I, plotter: Plot, - init: (Option>, Z, Y), + init: (Option>, Z, Y), //opKμ : KOpM, opKz: &KOpZ, fnR: &R, fnH: &H, -) -> DynResult> +) -> DynResult> where + U: Space + Clone, F: Float + ToNalgebraRealField, I: AlgIteratorFactory>, - Dat: DifferentiableMapping, Codomain = F, DerivativeDomain = Pair>, + Dat: DifferentiableMapping, Codomain = F, DerivativeDomain = Pair>, //Pair: ClosedMul, // Doesn't really need to be closed, if make this signature more complex… - S: DifferentiableRealMapping + ClosedMul, - RNDM: SpikeMerging, - Reg: RegTerm, F>, - P: ProxPenalty, S, Reg, F>, + S: ClosedMul, + DiscreteMeasure: SpikeMerging, + Reg: RegTerm, + P: ProxPenalty, for<'a> Pair<&'a P, &'a IdOp>: StepLengthBoundPair, KOpZ: BoundedLinear + GEMV @@ -370,7 +372,7 @@ R: Prox, H: Conjugable, for<'b> H::Conjugate<'b>: Prox, - Plot: Plotter>, + Plot: Plotter>, { pointsource_forward_pdps_pair_dom( f, @@ -393,31 +395,32 @@ /// The implementation uses [`pointsource_forward_pdps_pair`] with appropriate dummy /// variables, operators, and functions. #[replace_float_literals(F::cast_from(literal))] -pub fn pointsource_fb_pair_dom( +pub fn pointsource_fb_pair_dom( f: &Dat, reg: &Reg, prox_penalty: &P, config: &FBConfig, iterator: I, plotter: Plot, - (μ0, z): (Option>, Z), + (μ0, z): (Option>, Z), //opKμ : KOpM, fnR: &R, - domain: &mut impl AdmissibleDomain>, -) -> DynResult> + domain: &mut impl AdmissibleDomain, +) -> DynResult> where + U: Space + Clone, F: Float + ToNalgebraRealField, I: AlgIteratorFactory>, - Dat: DifferentiableMapping, Codomain = F, DerivativeDomain = Pair>, - S: DifferentiableRealMapping + ClosedMul, - RNDM: SpikeMerging, - Reg: RegTerm, F>, - P: ProxPenalty, S, Reg, F>, + Dat: DifferentiableMapping, Codomain = F, DerivativeDomain = Pair>, + S: ClosedMul, + DiscreteMeasure: SpikeMerging, + Reg: RegTerm, + P: ProxPenalty, for<'a> Pair<&'a P, &'a IdOp>: StepLengthBoundPair, Z: ClosedEuclidean + AXPY + Clone, for<'b> &'b Z: Instance, R: Prox, - Plot: Plotter>, + Plot: Plotter>, // We should not need to explicitly require this: for<'b> &'b Loc<0, F>: Instance>, { @@ -445,30 +448,31 @@ #[deprecated] #[replace_float_literals(F::cast_from(literal))] -pub fn pointsource_fb_pair( +pub fn pointsource_fb_pair( f: &Dat, reg: &Reg, prox_penalty: &P, config: &FBConfig, iterator: I, plotter: Plot, - init: (Option>, Z), + init: (Option>, Z), //opKμ : KOpM, fnR: &R, -) -> DynResult> +) -> DynResult> where + U: Space + Clone, F: Float + ToNalgebraRealField, I: AlgIteratorFactory>, - Dat: DifferentiableMapping, Codomain = F, DerivativeDomain = Pair>, - S: DifferentiableRealMapping + ClosedMul, - RNDM: SpikeMerging, - Reg: RegTerm, F>, - P: ProxPenalty, S, Reg, F>, + Dat: DifferentiableMapping, Codomain = F, DerivativeDomain = Pair>, + S: DifferentiableMapping + ClosedMul, + DiscreteMeasure: SpikeMerging, + Reg: RegTerm, + P: ProxPenalty, for<'a> Pair<&'a P, &'a IdOp>: StepLengthBoundPair, Z: ClosedEuclidean + AXPY + Clone, for<'b> &'b Z: Instance, R: Prox, - Plot: Plotter>, + Plot: Plotter>, // We should not need to explicitly require this: for<'b> &'b Loc<0, F>: Instance>, { diff -r 759634edb536 -r 8f1e57821d76 src/frank_wolfe.rs --- a/src/frank_wolfe.rs Tue Aug 04 20:11:10 2026 -0500 +++ b/src/frank_wolfe.rs Thu Aug 06 11:14:15 2026 -0500 @@ -20,7 +20,7 @@ use crate::dataterm::QuadraticDataTerm; use crate::forward_model::ForwardModel; use crate::measures::merging::{SpikeMerging, SpikeMergingMethod}; -use crate::measures::{DeltaMeasure, DiscreteMeasure, Radon, RNDM}; +use crate::measures::{DeltaMeasure, DiscreteMeasure, Radon}; use crate::plot::Plotter; use crate::regularisation::{NonnegRadonRegTerm, RadonRegTerm, RegTerm}; #[allow(unused_imports)] // Used in documentation @@ -29,18 +29,15 @@ }; use crate::tolerance::Tolerance; use crate::types::*; -use alg_tools::bisection_tree::P2Minimise; use alg_tools::bounds::MinMaxMapping; use alg_tools::error::DynResult; use alg_tools::euclidean::Euclidean; use alg_tools::instance::Instance; use alg_tools::iterate::{AlgIteratorFactory, AlgIteratorOptions, ValueIteratorFactory}; -use alg_tools::linops::Mapping; -use alg_tools::loc::Loc; +use alg_tools::linops::{Mapping, Space}; use alg_tools::nalgebra_support::ToNalgebraRealField; use alg_tools::norms::Norm; use alg_tools::norms::L2; -use alg_tools::sets::Cube; /// Settings for [`pointsource_fw_reg`]. #[derive(Clone, Copy, Eq, PartialEq, Serialize, Deserialize, Debug)] @@ -106,9 +103,9 @@ /// Trait for finite dimensional weight optimisation. pub trait WeightOptim< F: Float + ToNalgebraRealField, - A: ForwardModel, F>, + U: Space + Clone + PartialEq, + A: ForwardModel, F>, I: AlgIteratorFactory, - const N: usize, > { /// Return a pre-initialisation struct for [`Self::optimise_weights`]. @@ -135,7 +132,7 @@ /// Returns the number of iterations taken by the method configured in `inner`. fn optimise_weights<'a>( &self, - μ: &mut RNDM, + μ: &mut DiscreteMeasure, opA: &'a A, b: &A::Observable, findim_data: &FindimData, @@ -147,10 +144,10 @@ /// Trait for regularisation terms supported by [`pointsource_fw_reg`]. pub trait RegTermFW< F: Float + ToNalgebraRealField, - A: ForwardModel, F>, + U: Space + Clone + PartialEq, + A: ForwardModel, F>, I: AlgIteratorFactory, - const N: usize, ->: RegTerm, F> + WeightOptim + Mapping, Codomain = F> +>: RegTerm + WeightOptim + Mapping, Codomain = F> { /// With $g = A\_\*(Aμ-b)$, returns $(x, g(x))$ for $x$ a new point to be inserted /// into $μ$, as determined by the regulariser. @@ -162,26 +159,26 @@ g: &mut A::PreadjointCodomain, refinement_tolerance: F, max_steps: usize, - ) -> (Loc, F); + ) -> (U, F); /// Insert point `ξ` into `μ` for the relaxed algorithm from Bredies–Pikkarainen. fn relaxed_insert<'a>( &self, - μ: &mut RNDM, + μ: &mut DiscreteMeasure, g: &A::PreadjointCodomain, opA: &'a A, - ξ: Loc, + ξ: U, v_ξ: F, findim_data: &FindimData, ); } #[replace_float_literals(F::cast_from(literal))] -impl WeightOptim - for RadonRegTerm +impl WeightOptim for RadonRegTerm where + U: Space + Clone + PartialEq, I: AlgIteratorFactory, - A: FindimQuadraticModel, F>, + A: FindimQuadraticModel, { fn prepare_optimise_weights(&self, opA: &A, b: &A::Observable) -> DynResult> { Ok(FindimData { @@ -192,7 +189,7 @@ fn optimise_weights<'a>( &self, - μ: &mut RNDM, + μ: &mut DiscreteMeasure, opA: &'a A, b: &A::Observable, findim_data: &FindimData, @@ -221,23 +218,24 @@ } #[replace_float_literals(F::cast_from(literal))] -impl RegTermFW for RadonRegTerm +impl RegTermFW for RadonRegTerm where - Cube: P2Minimise, F>, + U: Space + Clone + PartialEq, + RadonRegTerm: RegTerm, I: AlgIteratorFactory, - A: FindimQuadraticModel, F>, - A::PreadjointCodomain: MinMaxMapping, F>, + A: FindimQuadraticModel, + A::PreadjointCodomain: MinMaxMapping, for<'a> &'a A::PreadjointCodomain: Instance, // FIXME: the following *should not* be needed, they are already implied - RNDM: Mapping, - DeltaMeasure, F>: Mapping, + DiscreteMeasure: Mapping, + DeltaMeasure: Copy + Mapping, { fn find_insertion( &self, g: &mut A::PreadjointCodomain, refinement_tolerance: F, max_steps: usize, - ) -> (Loc, F) { + ) -> (U, F) { let (ξmax, v_ξmax) = g.maximise(refinement_tolerance, max_steps); let (ξmin, v_ξmin) = g.minimise(refinement_tolerance, max_steps); if v_ξmin < 0.0 && -v_ξmin > v_ξmax { @@ -249,10 +247,10 @@ fn relaxed_insert<'a>( &self, - μ: &mut RNDM, + μ: &mut DiscreteMeasure, g: &A::PreadjointCodomain, opA: &'a A, - ξ: Loc, + ξ: U, v_ξ: F, findim_data: &FindimData, ) { @@ -285,11 +283,11 @@ } #[replace_float_literals(F::cast_from(literal))] -impl WeightOptim - for NonnegRadonRegTerm +impl WeightOptim for NonnegRadonRegTerm where + U: Space + Clone + PartialEq, I: AlgIteratorFactory, - A: FindimQuadraticModel, F>, + A: FindimQuadraticModel, { fn prepare_optimise_weights(&self, opA: &A, b: &A::Observable) -> DynResult> { Ok(FindimData { @@ -300,7 +298,7 @@ fn optimise_weights<'a>( &self, - μ: &mut RNDM, + μ: &mut DiscreteMeasure, opA: &'a A, b: &A::Observable, findim_data: &FindimData, @@ -329,33 +327,33 @@ } #[replace_float_literals(F::cast_from(literal))] -impl RegTermFW - for NonnegRadonRegTerm +impl RegTermFW for NonnegRadonRegTerm where - Cube: P2Minimise, F>, + U: Space + Clone + PartialEq, + NonnegRadonRegTerm: RegTerm, I: AlgIteratorFactory, - A: FindimQuadraticModel, F>, - A::PreadjointCodomain: MinMaxMapping, F>, + A: FindimQuadraticModel, + A::PreadjointCodomain: MinMaxMapping, for<'a> &'a A::PreadjointCodomain: Instance, // FIXME: the following *should not* be needed, they are already implied - RNDM: Mapping, - DeltaMeasure, F>: Mapping, + DiscreteMeasure: Mapping, + DeltaMeasure: Mapping, { fn find_insertion( &self, g: &mut A::PreadjointCodomain, refinement_tolerance: F, max_steps: usize, - ) -> (Loc, F) { + ) -> (U, F) { g.maximise(refinement_tolerance, max_steps) } fn relaxed_insert<'a>( &self, - μ: &mut RNDM, + μ: &mut DiscreteMeasure, g: &A::PreadjointCodomain, opA: &'a A, - ξ: Loc, + ξ: U, v_ξ: F, findim_data: &FindimData, ) { @@ -401,25 +399,25 @@ /// `iterator` is used to iterate the steps of the method, and `plotter` may be used to /// save intermediate iteration states as images. #[replace_float_literals(F::cast_from(literal))] -pub fn pointsource_fw_reg<'a, F, I, A, Reg, Plot, const N: usize>( - f: &'a QuadraticDataTerm, A>, +pub fn pointsource_fw_reg<'a, F, U, I, A, Reg, Plot>( + f: &'a QuadraticDataTerm, A>, reg: &Reg, - //domain : Cube, config: &FWConfig, iterator: I, mut plotter: Plot, - μ0: Option>, -) -> DynResult> + μ0: Option>, +) -> DynResult> where F: Float + ToNalgebraRealField, + U: Space + Clone + PartialEq, I: AlgIteratorFactory>, - A: ForwardModel, F>, - A::PreadjointCodomain: MinMaxMapping, F>, + A: ForwardModel, F>, + A::PreadjointCodomain: MinMaxMapping, &'a A::PreadjointCodomain: Instance, - Cube: P2Minimise, F>, - RNDM: SpikeMerging, - Reg: RegTermFW, N>, - Plot: Plotter>, + //Cube: P2Minimise, + DiscreteMeasure: SpikeMerging, + Reg: RegTermFW>, + Plot: Plotter>, { let opA = f.operator(); let b = f.data(); @@ -438,7 +436,7 @@ let mut residual = f.residual(&μ); // Statistics - let full_stats = |residual: &A::Observable, ν: &RNDM, ε, stats| IterInfo { + let full_stats = |residual: &A::Observable, ν: &DiscreteMeasure, ε, stats| IterInfo { value: residual.norm2_squared_div2() + reg.apply(ν), n_spikes: ν.len(), ε, diff -r 759634edb536 -r 8f1e57821d76 src/pdps.rs --- a/src/pdps.rs Tue Aug 04 20:11:10 2026 -0500 +++ b/src/pdps.rs Thu Aug 06 11:14:15 2026 -0500 @@ -42,7 +42,7 @@ use crate::forward_model::ForwardModel; use crate::measures::merging::SpikeMerging; use crate::measures::merging::SpikeMergingMethod; -use crate::measures::{DiscreteMeasure, RNDM}; +use crate::measures::DiscreteMeasure; use crate::plot::Plotter; pub use crate::prox_penalty::{InsertionConfig, ProxPenalty, StepLengthBoundPD}; use crate::regularisation::RegTerm; @@ -50,7 +50,7 @@ use alg_tools::convex::{Conjugable, ConvexMapping, Prox}; use alg_tools::error::DynResult; use alg_tools::iterate::AlgIteratorFactory; -use alg_tools::linops::{Mapping, AXPY}; +use alg_tools::linops::{Mapping, Space, AXPY}; use alg_tools::mapping::{DataTerm, Instance}; use alg_tools::nalgebra_support::ToNalgebraRealField; use anyhow::ensure; @@ -140,27 +140,29 @@ /// /// Returns the final iterate. #[replace_float_literals(F::cast_from(literal))] -pub fn pointsource_pdps_reg<'a, F, I, A, Phi, Reg, Plot, P, const N: usize>( - f: &'a DataTerm, A, Phi>, +pub fn pointsource_pdps_reg<'a, F, U, I, A, Phi, Reg, Plot, P>( + f: &'a DataTerm, A, Phi>, reg: &Reg, prox_penalty: &P, pdpsconfig: &PDPSConfig, iterator: I, mut plotter: Plot, - μ0: Option>, -) -> DynResult> + μ0: Option>, +) -> DynResult> where + U: Space + Clone + PartialEq, F: Float + ToNalgebraRealField, I: AlgIteratorFactory>, - A: ForwardModel, F>, + A: ForwardModel, F>, for<'b> &'b A::Observable: Instance, A::Observable: AXPY, - RNDM: SpikeMerging, - Reg: RegTerm, F>, + DiscreteMeasure: SpikeMerging, + Reg: RegTerm, Phi: Conjugable, for<'b> Phi::Conjugate<'b>: Prox, - P: ProxPenalty, A::PreadjointCodomain, Reg, F> + StepLengthBoundPD>, - Plot: Plotter