Mercurial > repos > pointsource_algs / file diff

--- a/src/experiments.rs	Mon Jan 06 11:32:57 2025 -0500
+++ b/src/experiments.rs	Thu Jan 23 23:35:28 2025 +0100
@@ -24,7 +24,8 @@
     ExperimentBiased,
     Named,
     DefaultAlgorithm,
-    AlgorithmConfig
+    AlgorithmConfig,
+    ProxTerm
 };
 //use crate::fb::FBGenericConfig;
 use crate::rand_distr::{SerializableNormal, SaltAndPepper};
@@ -153,7 +154,11 @@
                 .. Default::default()
             }
         };
-
+        let defaults_2d = HashMap::from([
+            (DefaultAlgorithm::PDPS, AlgorithmConfig::PDPS(pdps_2d(), ProxTerm::Wave)),
+            (DefaultAlgorithm::RadonPDPS, AlgorithmConfig::PDPS(pdps_2d(), ProxTerm::RadonSquared))
+        ]);
+        
         //  We add a hash of the experiment name to the configured
         // noise seed to not use the same noise for different experiments.
         let mut h = DefaultHasher::new();
@@ -212,9 +217,7 @@
                     kernel : Prod(AutoConvolution(spread_cutoff), base_spread),
                     kernel_plot_width,
                     noise_seed,
-                    algorithm_defaults: HashMap::from([
-                        (DefaultAlgorithm::PDPS, AlgorithmConfig::PDPS(pdps_2d()))
-                    ]),
+                    algorithm_defaults: defaults_2d,
                 }})
             },
             Experiment2DFast => {
@@ -231,9 +234,7 @@
                     kernel : base_spread,
                     kernel_plot_width,
                     noise_seed,
-                    algorithm_defaults: HashMap::from([
-                        (DefaultAlgorithm::PDPS, AlgorithmConfig::PDPS(pdps_2d()))
-                    ]),
+                    algorithm_defaults: defaults_2d,
                 }})
             },
             Experiment1D_L1 => {
@@ -295,9 +296,7 @@
                     kernel : Prod(AutoConvolution(spread_cutoff), base_spread),
                     kernel_plot_width,
                     noise_seed,
-                    algorithm_defaults: HashMap::from([
-                        (DefaultAlgorithm::PDPS, AlgorithmConfig::PDPS(pdps_2d()))
-                    ]),
+                    algorithm_defaults: defaults_2d,
                 }})
             },
             Experiment2D_L1_Fast => {
@@ -317,9 +316,7 @@
                     kernel : base_spread,
                     kernel_plot_width,
                     noise_seed,
-                    algorithm_defaults: HashMap::from([
-                        (DefaultAlgorithm::PDPS, AlgorithmConfig::PDPS(pdps_2d()))
-                    ]),
+                    algorithm_defaults: defaults_2d,
                 }})
             },
             Experiment1D_TV_Fast => {