Mercurial > repos > pointsource_algs / changeset

--- a/src/experiments.rs	Fri Jan 31 18:00:17 2025 -0500
+++ b/src/experiments.rs	Sat Feb 01 16:47:11 2025 -0500
@@ -180,6 +180,15 @@
                 .. Default::default()
             }
         );
+        let higher_cpos_merging_steptune = |alg| (alg,
+            AlgorithmOverrides {
+                transport_tolerance_pos : Some(1000.0),
+                theta0 : Some(0.3),
+                merge : Some(true),
+                fitness_merging : Some(true),
+                .. Default::default()
+            }
+        );
         let much_higher_cpos_merging_steptune = |alg| (alg,
             AlgorithmOverrides {
                 transport_tolerance_pos : Some(10000.0),
@@ -264,8 +273,6 @@
                         sliding_fb_cut_gaussian,
                         higher_cpos_merging(DefaultAlgorithm::RadonFB),
                         higher_cpos_merging(DefaultAlgorithm::RadonSlidingFB),
-                        // pdps_2d,
-                        // radon_pdps_2d
                     ]),
                 }})
             },
@@ -285,8 +292,6 @@
                     noise_seed,
                     default_merge_radius,
                     algorithm_overrides: HashMap::from([
-                        // pdps_2d,
-                        // radon_pdps_2d
                         higher_cpos_merging(DefaultAlgorithm::RadonFB),
                         higher_cpos_merging(DefaultAlgorithm::RadonSlidingFB),
                     ]),
@@ -355,8 +360,6 @@
                     noise_seed,
                     default_merge_radius,
                     algorithm_overrides: HashMap::from([
-                        // pdps_2d,
-                        // radon_pdps_2d
                     ]),
                 }})
             },
@@ -379,8 +382,6 @@
                     noise_seed,
                     default_merge_radius,
                     algorithm_overrides: HashMap::from([
-                        // pdps_2d,
-                        // radon_pdps_2d
                     ]),
                 }})
             },
@@ -406,8 +407,8 @@
                         noise_seed,
                         default_merge_radius,
                         algorithm_overrides: HashMap::from([
-                            higher_cpos_merging(DefaultAlgorithm::RadonForwardPDPS),
-                            higher_cpos_merging(DefaultAlgorithm::RadonSlidingPDPS),
+                            higher_cpos_merging_steptune(DefaultAlgorithm::RadonForwardPDPS),
+                            higher_cpos_merging_steptune(DefaultAlgorithm::RadonSlidingPDPS),
                         ]),
                     },
                 }})

--- a/src/sliding_fb.rs	Fri Jan 31 18:00:17 2025 -0500
+++ b/src/sliding_fb.rs	Sat Feb 01 16:47:11 2025 -0500
@@ -66,7 +66,7 @@
 impl<F : Float> Default for TransportConfig<F> {
     fn default() -> Self {
         TransportConfig {
-            θ0 : 0.4,
+            θ0 : 0.9,
             adaptation : 0.9,
             tolerance_mult_pos : 100.0,
         }

--- a/src/sliding_pdps.rs	Fri Jan 31 18:00:17 2025 -0500
+++ b/src/sliding_pdps.rs	Sat Feb 01 16:47:11 2025 -0500
@@ -74,7 +74,7 @@
             τ0 : 0.99,
             σd0 : 0.05,
             σp0 : 0.99,
-            transport : TransportConfig { θ0 : 0.1, ..Default::default()},
+            transport : TransportConfig { θ0 : 0.9, ..Default::default()},
             insertion : Default::default()
         }
     }