Mercurial > repos > pointsource_algs / file comparison
comparison: src/experiments.rs
src/experiments.rs
- branch
- dev
- changeset 45
- 5200e7090e06
- parent 41
- b6bdb6cb4d44
equal
deleted
inserted
replaced
| 44:03251c546744 | 45:5200e7090e06 |
|---|---|
| 178 merge : Some(true), | 178 merge : Some(true), |
| 179 fitness_merging : Some(true), | 179 fitness_merging : Some(true), |
| 180 .. Default::default() | 180 .. Default::default() |
| 181 } | 181 } |
| 182 ); | 182 ); |
| 183 let higher_cpos_merging_steptune = |alg| (alg, | |
| 184 AlgorithmOverrides { | |
| 185 transport_tolerance_pos : Some(1000.0), | |
| 186 theta0 : Some(0.3), | |
| 187 merge : Some(true), | |
| 188 fitness_merging : Some(true), | |
| 189 .. Default::default() | |
| 190 } | |
| 191 ); | |
| 183 let much_higher_cpos_merging_steptune = |alg| (alg, | 192 let much_higher_cpos_merging_steptune = |alg| (alg, |
| 184 AlgorithmOverrides { | 193 AlgorithmOverrides { |
| 185 transport_tolerance_pos : Some(10000.0), | 194 transport_tolerance_pos : Some(10000.0), |
| 186 sigma0 : Some(0.15), | 195 sigma0 : Some(0.15), |
| 187 theta0 : Some(0.3), | 196 theta0 : Some(0.3), |
| 262 default_merge_radius, | 271 default_merge_radius, |
| 263 algorithm_overrides: HashMap::from([ | 272 algorithm_overrides: HashMap::from([ |
| 264 sliding_fb_cut_gaussian, | 273 sliding_fb_cut_gaussian, |
| 265 higher_cpos_merging(DefaultAlgorithm::RadonFB), | 274 higher_cpos_merging(DefaultAlgorithm::RadonFB), |
| 266 higher_cpos_merging(DefaultAlgorithm::RadonSlidingFB), | 275 higher_cpos_merging(DefaultAlgorithm::RadonSlidingFB), |
| 267 // pdps_2d, | |
| 268 // radon_pdps_2d | |
| 269 ]), | 276 ]), |
| 270 }}) | 277 }}) |
| 271 }, | 278 }, |
| 272 Experiment2DFast => { | 279 Experiment2DFast => { |
| 273 let base_spread = HatConv { radius : Hat1 }; | 280 let base_spread = HatConv { radius : Hat1 }; |
| 283 kernel : base_spread, | 290 kernel : base_spread, |
| 284 kernel_plot_width, | 291 kernel_plot_width, |
| 285 noise_seed, | 292 noise_seed, |
| 286 default_merge_radius, | 293 default_merge_radius, |
| 287 algorithm_overrides: HashMap::from([ | 294 algorithm_overrides: HashMap::from([ |
| 288 // pdps_2d, | |
| 289 // radon_pdps_2d | |
| 290 higher_cpos_merging(DefaultAlgorithm::RadonFB), | 295 higher_cpos_merging(DefaultAlgorithm::RadonFB), |
| 291 higher_cpos_merging(DefaultAlgorithm::RadonSlidingFB), | 296 higher_cpos_merging(DefaultAlgorithm::RadonSlidingFB), |
| 292 ]), | 297 ]), |
| 293 }}) | 298 }}) |
| 294 }, | 299 }, |
| 353 kernel : Prod(AutoConvolution(spread_cutoff), base_spread), | 358 kernel : Prod(AutoConvolution(spread_cutoff), base_spread), |
| 354 kernel_plot_width, | 359 kernel_plot_width, |
| 355 noise_seed, | 360 noise_seed, |
| 356 default_merge_radius, | 361 default_merge_radius, |
| 357 algorithm_overrides: HashMap::from([ | 362 algorithm_overrides: HashMap::from([ |
| 358 // pdps_2d, | |
| 359 // radon_pdps_2d | |
| 360 ]), | 363 ]), |
| 361 }}) | 364 }}) |
| 362 }, | 365 }, |
| 363 Experiment2D_L1_Fast => { | 366 Experiment2D_L1_Fast => { |
| 364 let base_spread = HatConv { radius : Hat1 }; | 367 let base_spread = HatConv { radius : Hat1 }; |
| 377 kernel : base_spread, | 380 kernel : base_spread, |
| 378 kernel_plot_width, | 381 kernel_plot_width, |
| 379 noise_seed, | 382 noise_seed, |
| 380 default_merge_radius, | 383 default_merge_radius, |
| 381 algorithm_overrides: HashMap::from([ | 384 algorithm_overrides: HashMap::from([ |
| 382 // pdps_2d, | |
| 383 // radon_pdps_2d | |
| 384 ]), | 385 ]), |
| 385 }}) | 386 }}) |
| 386 }, | 387 }, |
| 387 Experiment1D_TV_Fast => { | 388 Experiment1D_TV_Fast => { |
| 388 let base_spread = HatConv { radius : HatBias }; | 389 let base_spread = HatConv { radius : HatBias }; |
| 404 kernel : base_spread, | 405 kernel : base_spread, |
| 405 kernel_plot_width, | 406 kernel_plot_width, |
| 406 noise_seed, | 407 noise_seed, |
| 407 default_merge_radius, | 408 default_merge_radius, |
| 408 algorithm_overrides: HashMap::from([ | 409 algorithm_overrides: HashMap::from([ |
| 409 higher_cpos_merging(DefaultAlgorithm::RadonForwardPDPS), | 410 higher_cpos_merging_steptune(DefaultAlgorithm::RadonForwardPDPS), |
| 410 higher_cpos_merging(DefaultAlgorithm::RadonSlidingPDPS), | 411 higher_cpos_merging_steptune(DefaultAlgorithm::RadonSlidingPDPS), |
| 411 ]), | 412 ]), |
| 412 }, | 413 }, |
| 413 }}) | 414 }}) |
| 414 }, | 415 }, |
| 415 Experiment2D_TV_Fast => { | 416 Experiment2D_TV_Fast => { |
