diff -r eb98b05b9c60 -r 87649ccfa6a8 src/pdps.rs --- a/src/pdps.rs Fri Apr 28 08:19:05 2023 +0300 +++ b/src/pdps.rs Fri Apr 28 08:20:51 2023 +0300 @@ -49,7 +49,6 @@ use clap::ValueEnum; use alg_tools::iterate:: AlgIteratorFactory; -use alg_tools::sets::Cube; use alg_tools::loc::Loc; use alg_tools::euclidean::Euclidean; use alg_tools::norms::{ @@ -63,7 +62,6 @@ BTNodeLookup, BTNode, BTSearch, - P2Minimise, SupportGenerator, LocalAnalysis, }; @@ -91,7 +89,6 @@ generic_pointsource_fb_reg, RegTerm, }; -use crate::regularisation::NonnegRadonRegTerm; /// Acceleration #[derive(Clone, Copy, Eq, PartialEq, Serialize, Deserialize, ValueEnum, Debug)] @@ -356,41 +353,3 @@ ) } -// -// Deprecated interfaces -// - -#[deprecated(note = "Use `pointsource_pdps_reg`")] -pub fn pointsource_pdps<'a, F, I, A, GA, 𝒟, BTA, G𝒟, S, K, D, const N : usize>( - opA : &'a A, - b : &'a A::Observable, - α : F, - op𝒟 : &'a 𝒟, - config : &PDPSConfig, - iterator : I, - plotter : SeqPlotter, - dataterm : D, -) -> DiscreteMeasure, F> -where F : Float + ToNalgebraRealField, - I : AlgIteratorFactory>, - for<'b> &'b A::Observable : std::ops::Neg - + std::ops::Add, - A::Observable : std::ops::MulAssign, - GA : SupportGenerator + Clone, - A : ForwardModel, F, PreadjointCodomain = BTFN> - + Lipschitz<𝒟, FloatType=F>, - BTA : BTSearch>, - G𝒟 : SupportGenerator + Clone, - 𝒟 : DiscreteMeasureOp, F, PreCodomain = PreBTFN>, - 𝒟::Codomain : RealMapping, - S: RealMapping + LocalAnalysis, N>, - K: RealMapping + LocalAnalysis, N>, - BTNodeLookup: BTNode, N>, - Cube: P2Minimise, F>, - PlotLookup : Plotting, - DiscreteMeasure, F> : SpikeMerging, - PDPS<'a, F, A, D, N> : FBSpecialisation, - D : Subdifferentiable { - - pointsource_pdps_reg(opA, b, NonnegRadonRegTerm(α), op𝒟, config, iterator, plotter, dataterm) -}