Mercurial > repos > pointsource_algs / file diff

--- a/src/experiments.rs	Sun Dec 11 23:25:53 2022 +0200
+++ b/src/experiments.rs	Tue Mar 21 20:31:01 2023 +0200
@@ -140,7 +140,7 @@
                 Box::new(Named { name, data : ExperimentV2 {
                     domain : [[0.0, 1.0]].into(),
                     sensor_count : [N_SENSORS_1D],
-                    regularisation : Regularisation::Radon(cli.alpha.unwrap_or(0.09)),
+                    regularisation : Regularisation::NonnegRadon(cli.alpha.unwrap_or(0.09)),
                     noise_distr : SerializableNormal::new(0.0, cli.variance.unwrap_or(0.2))?,
                     dataterm : DataTerm::L2Squared,
                     μ_hat : MU_TRUE_1D_BASIC.into(),
@@ -157,7 +157,7 @@
                 Box::new(Named { name, data : ExperimentV2 {
                     domain : [[0.0, 1.0]].into(),
                     sensor_count : [N_SENSORS_1D],
-                    regularisation : Regularisation::Radon(cli.alpha.unwrap_or(0.06)),
+                    regularisation : Regularisation::NonnegRadon(cli.alpha.unwrap_or(0.06)),
                     noise_distr : SerializableNormal::new(0.0, cli.variance.unwrap_or(0.2))?,
                     dataterm : DataTerm::L2Squared,
                     μ_hat : MU_TRUE_1D_BASIC.into(),
@@ -175,7 +175,7 @@
                 Box::new(Named { name, data : ExperimentV2 {
                     domain : [[0.0, 1.0]; 2].into(),
                     sensor_count : [N_SENSORS_2D; 2],
-                    regularisation : Regularisation::Radon(cli.alpha.unwrap_or(0.19)),
+                    regularisation : Regularisation::NonnegRadon(cli.alpha.unwrap_or(0.19)),
                     noise_distr : SerializableNormal::new(0.0, cli.variance.unwrap_or(0.25))?,
                     dataterm : DataTerm::L2Squared,
                     μ_hat : MU_TRUE_2D_BASIC.into(),
@@ -194,7 +194,7 @@
                 Box::new(Named { name, data : ExperimentV2 {
                     domain : [[0.0, 1.0]; 2].into(),
                     sensor_count : [N_SENSORS_2D; 2],
-                    regularisation : Regularisation::Radon(cli.alpha.unwrap_or(0.12)),
+                    regularisation : Regularisation::NonnegRadon(cli.alpha.unwrap_or(0.12)),
                     noise_distr : SerializableNormal::new(0.0, cli.variance.unwrap_or(0.15))?, //0.25
                     dataterm : DataTerm::L2Squared,
                     μ_hat : MU_TRUE_2D_BASIC.into(),