pointsource_algs: comparison src/run.rs

-:c5d8bd1a7728
+:0f59c0d02e13
 //         format!("{:?}", self).hash(state);
 //     }
 // }
 /// Plotting level configuration
-#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Serialize, ValueEnum, Debug)]
+#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize, ValueEnum, Debug)]
 pub enum PlotLevel {
 /// Plot nothing
 #[clap(name = "none")]
 None,
 /// Plot problem data
 DefaultBT<F, N>,
 N
 >;
 /// This is a dirty workaround to rust-csv not supporting struct flattening etc.
-#[derive(Serialize)]
+#[derive(Serialize, Deserialize)]
 struct CSVLog<F> {
 iter : usize,
 cpu_time : f64,
 value : F,
 relative_value : F,
 pruned : usize,
 this_iters : usize,
 }
 /// Collected experiment statistics
-#[derive(Clone, Debug, Serialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 struct ExperimentStats<F : Float> {
 /// Signal-to-noise ratio in decibels
 ssnr : F,
 /// Proportion of noise in the signal as a number in $[0, 1]$.
 noise_ratio : F,
 when : Utc::now(),
 }
 }
 }
 /// Collected algorithm statistics
-#[derive(Clone, Debug, Serialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 struct AlgorithmStats<F : Float> {
 /// Overall CPU time spent
 cpu_time : F,
 /// Real time spent
 elapsed : F
 Ok(())
 }
 /// Struct for experiment configurations
-#[derive(Debug, Clone, Serialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(bound(
+serialize = "Cube<F, N> : Serialize,
+NoiseDistr : Serialize,
+[usize; N] : Serialize,
+RNDM<F, N> : Serialize,
+Regularisation<F> : Serialize,
+F : Serialize,
+S : Serialize,
+P : Serialize,
+K : Serialize",
+deserialize = "Cube<F, N> : for<'a> Deserialize<'a>,
+NoiseDistr : for<'a> Deserialize<'a>,
+[usize; N] : for<'a> Deserialize<'a>,
+RNDM<F, N> : for<'a> Deserialize<'a>,
+Regularisation<F> : for<'a> Deserialize<'a>,
+F : for<'a> Deserialize<'a>,
+S : for<'a> Deserialize<'a>,
+P : for<'a> Deserialize<'a>,
+K : for<'a> Deserialize<'a>,",
+))]
 pub struct ExperimentV2<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>,
 {
 /// A map of default configurations for algorithms
 #[serde(skip)]
 pub algorithm_defaults : HashMap<DefaultAlgorithm, AlgorithmConfig<F>>,
 }
-#[derive(Debug, Clone, Serialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(bound(
+serialize = "ExperimentV2<F, NoiseDistr, S, K, P, N> : Serialize,
+B : Serialize,
+F : Serialize",
+deserialize = "ExperimentV2<F, NoiseDistr, S, K, P, N >: for<'a> Deserialize<'a>,
+B : for<'a> Deserialize<'a>,
+F : for<'a> Deserialize<'a>",
+))]
 pub struct ExperimentBiased<F, NoiseDistr, S, K, P, B, const N : usize>
 where F : Float,
 [usize; N] : Serialize,
 NoiseDistr : Distribution<F>,
 S : Sensor<F, N>,
 String,
 ) -> Result<(RNDM<F, N>, Z), RunError>,
 ) ->  DynError
 where
 PlotLookup : Plotting<N>,
+DeltaMeasure<Loc<F, N>, F> : Serialize,
 {
 let mut logs = Vec::new();
 let iterator_options = AlgIteratorOptions{
 max_iter : cli.max_iter,
 PlotLookup : Plotting<N>,
 DefaultBT<F, N> : SensorGridBT<F, S, P, N, Depth=DynamicDepth> + BTSearch<F, N>,
 BTNodeLookup: BTNode<F, usize, Bounds<F>, N>,
 RNDM<F, N> : SpikeMerging<F>,
 NoiseDistr : Distribution<F> + Serialize + std::fmt::Debug,
+[F; N] : Serialize,
+[[F; 2]; N] : Serialize,
 // DefaultSG<F, S, P, N> : ForwardModel<RNDM<F, N>, F, PreadjointCodomain = PreadjointCodomain, Observable=DVector<F::MixedType>>,
 // PreadjointCodomain : Space + Bounded<F> + DifferentiableRealMapping<F, N>,
 // DefaultSeminormOp<F, K, N> : ProxPenalty<F, PreadjointCodomain, RadonRegTerm<F>, N>,
 // DefaultSeminormOp<F, K, N> : ProxPenalty<F, PreadjointCodomain, NonnegRadonRegTerm<F>, N>,
 // RadonSquared : ProxPenalty<F, PreadjointCodomain, RadonRegTerm<F>, N>,
 DefaultBT<F, N> : SensorGridBT<F, S, P, N, Depth=DynamicDepth> + BTSearch<F, N>,
 BTNodeLookup: BTNode<F, usize, Bounds<F>, N>,
 RNDM<F, N> : SpikeMerging<F>,
 NoiseDistr : Distribution<F> + Serialize + std::fmt::Debug,
 B : Mapping<Loc<F, N>, Codomain = F> + Serialize + std::fmt::Debug,
+[F; N] : Serialize,
+[[F; 2]; N] : Serialize,
 // DefaultSG<F, S, P, N> : ForwardModel<RNDM<F, N>, F, PreadjointCodomain = PreadjointCodomain, Observable=DVector<F::MixedType>>,
 // PreadjointCodomain : Bounded<F> + DifferentiableRealMapping<F, N>,
 // DefaultSeminormOp<F, K, N> :  ProxPenalty<F, PreadjointCodomain, RadonRegTerm<F>, N>,
 // DefaultSeminormOp<F, K, N> :  ProxPenalty<F, PreadjointCodomain, NonnegRadonRegTerm<F>, N>,
 // RadonSquared : ProxPenalty<F, PreadjointCodomain, RadonRegTerm<F>, N>,
 opA : &A,
 b_hat : &A::Observable,
 b : &A::Observable,
 kernel_plot_width : F,
 ) -> DynError
-where F : Float + ToNalgebraRealField,
+where
-Sensor : RealMapping<F, N> + Support<F, N> + Clone,
+F : Float + ToNalgebraRealField,
-Spread : RealMapping<F, N> + Support<F, N> + Clone,
+Sensor : RealMapping<F, N> + Support<F, N> + Clone,
-Kernel : RealMapping<F, N> + Support<F, N>,
+Spread : RealMapping<F, N> + Support<F, N> + Clone,
-Convolution<Sensor, Spread> : DifferentiableRealMapping<F, N> + Support<F, N>,
+Kernel : RealMapping<F, N> + Support<F, N>,
-𝒟 : DiscreteMeasureOp<Loc<F, N>, F>,
+Convolution<Sensor, Spread> : DifferentiableRealMapping<F, N> + Support<F, N>,
-𝒟::Codomain : RealMapping<F, N>,
+𝒟 : DiscreteMeasureOp<Loc<F, N>, F>,
-A : ForwardModel<RNDM<F, N>, F>,
+𝒟::Codomain : RealMapping<F, N>,
-for<'a> &'a A::Observable : Instance<A::Observable>,
+A : ForwardModel<RNDM<F, N>, F>,
-A::PreadjointCodomain : DifferentiableRealMapping<F, N> + Bounded<F>,
+for<'a> &'a A::Observable : Instance<A::Observable>,
-PlotLookup : Plotting<N>,
+A::PreadjointCodomain : DifferentiableRealMapping<F, N> + Bounded<F>,
-Cube<F, N> : SetOrd {
+PlotLookup : Plotting<N>,
+Cube<F, N> : SetOrd,
+DeltaMeasure<Loc<F, N>, F> : Serialize,
+{
 if cli.plot < PlotLevel::Data {
 return Ok(())
 }

Mercurial > repos > pointsource_algs / file comparison

comparison: src/run.rs

src/run.rs