Mercurial > repos > pointsource_algs / file diff

--- a/src/run.rs	Fri Apr 28 08:19:05 2023 +0300
+++ b/src/run.rs	Fri Apr 28 08:20:51 2023 +0300
@@ -367,7 +367,6 @@
                 ..
             }
         } = self;
-        #[allow(deprecated)]
         let regularisation = $reg_convert(self.data.$reg_field);
 
         println!("{}\n{}",
@@ -655,47 +654,3 @@
     opA.write_observable(&b_hat, pfx("b_hat"))?;
     opA.write_observable(&b, pfx("b_noisy"))
 }
-
-//
-// Deprecated interface
-//
-
-/// Struct for experiment configurations
-#[derive(Debug, Clone, Serialize)]
-pub struct Experiment<F, NoiseDistr, S, K, P, const N : usize>
-where F : Float,
-      [usize; N] : Serialize,
-      NoiseDistr : Distribution<F>,
-      S : Sensor<F, N>,
-      P : Spread<F, N>,
-      K : SimpleConvolutionKernel<F, N>,
-{
-    /// Domain $Ω$.
-    pub domain : Cube<F, N>,
-    /// Number of sensors along each dimension
-    pub sensor_count : [usize; N],
-    /// Noise distribution
-    pub noise_distr : NoiseDistr,
-    /// Seed for random noise generation (for repeatable experiments)
-    pub noise_seed : u64,
-    /// Sensor $θ$; $θ * ψ$ forms the forward operator $𝒜$.
-    pub sensor : S,
-    /// Spread $ψ$; $θ * ψ$ forms the forward operator $𝒜$.
-    pub spread : P,
-    /// Kernel $ρ$ of $𝒟$.
-    pub kernel : K,
-    /// True point sources
-    pub μ_hat : DiscreteMeasure<Loc<F, N>, F>,
-    /// Regularisation parameter
-    #[deprecated(note = "Use [`ExperimentV2`], which replaces `α` by more generic `regularisation`")]
-    pub α : F,
-    /// For plotting : how wide should the kernels be plotted
-    pub kernel_plot_width : F,
-    /// Data term
-    pub dataterm : DataTerm,
-    /// A map of default configurations for algorithms
-    #[serde(skip)]
-    pub algorithm_defaults : HashMap<DefaultAlgorithm, AlgorithmConfig<F>>,
-}
-
-impl_experiment!(Experiment, α, Regularisation::NonnegRadon);