Mercurial > repos > pointsource_algs / file diff

--- 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<F>,
-    iterator : I,
-    plotter : SeqPlotter<F, N>,
-    dataterm : D,
-) -> DiscreteMeasure<Loc<F, N>, F>
-where F : Float + ToNalgebraRealField,
-      I : AlgIteratorFactory<IterInfo<F, N>>,
-      for<'b> &'b A::Observable : std::ops::Neg<Output=A::Observable>
-                                  + std::ops::Add<A::Observable, Output=A::Observable>,
-      A::Observable : std::ops::MulAssign<F>,
-      GA : SupportGenerator<F, N, SupportType = S, Id = usize> + Clone,
-      A : ForwardModel<Loc<F, N>, F, PreadjointCodomain = BTFN<F, GA, BTA, N>>
-          + Lipschitz<𝒟, FloatType=F>,
-      BTA : BTSearch<F, N, Data=usize, Agg=Bounds<F>>,
-      G𝒟 : SupportGenerator<F, N, SupportType = K, Id = usize> + Clone,
-      𝒟 : DiscreteMeasureOp<Loc<F, N>, F, PreCodomain = PreBTFN<F, G𝒟, N>>,
-      𝒟::Codomain : RealMapping<F, N>,
-      S: RealMapping<F, N> + LocalAnalysis<F, Bounds<F>, N>,
-      K: RealMapping<F, N> + LocalAnalysis<F, Bounds<F>, N>,
-      BTNodeLookup: BTNode<F, usize, Bounds<F>, N>,
-      Cube<F, N>: P2Minimise<Loc<F, N>, F>,
-      PlotLookup : Plotting<N>,
-      DiscreteMeasure<Loc<F, N>, F> : SpikeMerging<F>,
-      PDPS<'a, F, A, D, N> : FBSpecialisation<F, A::Observable, N>,
-      D : Subdifferentiable<F, A::Observable> {
-
-    pointsource_pdps_reg(opA, b, NonnegRadonRegTerm(α), op𝒟, config, iterator, plotter, dataterm)
-}