Mercurial > repos > pointsource_algs / file comparison
comparison: src/run.rs
src/run.rs
- changeset 75
- 677a5fd1b014
- parent 73
- 9c6432200aba
- child 76
- b921ed0ab99b
- child 77
- be105c046777
equal
deleted
inserted
replaced
| 74:df92e78cc3f4 | 75:677a5fd1b014 |
|---|---|
| 121 merge_every: cli.merge_every.unwrap_or(g.merge_every), | 121 merge_every: cli.merge_every.unwrap_or(g.merge_every), |
| 122 merging: override_merging(g.merging), | 122 merging: override_merging(g.merging), |
| 123 final_merging: cli.final_merging.unwrap_or(g.final_merging), | 123 final_merging: cli.final_merging.unwrap_or(g.final_merging), |
| 124 fitness_merging: cli.fitness_merging.unwrap_or(g.fitness_merging), | 124 fitness_merging: cli.fitness_merging.unwrap_or(g.fitness_merging), |
| 125 inner: override_inner(g.inner), | 125 inner: override_inner(g.inner), |
| 126 extra_weight_optimisation_steps: cli | |
| 127 .extra_weight_optimisation_steps | |
| 128 .unwrap_or(g.extra_weight_optimisation_steps), | |
| 126 tolerance: cli | 129 tolerance: cli |
| 127 .tolerance | 130 .tolerance |
| 128 .as_ref() | 131 .as_ref() |
| 129 .map(unpack_tolerance) | 132 .map(unpack_tolerance) |
| 130 .unwrap_or(g.tolerance), | 133 .unwrap_or(g.tolerance), |
| 795 DefaultAlgorithm::FB, | 798 DefaultAlgorithm::FB, |
| 796 DefaultAlgorithm::RadonFB, | 799 DefaultAlgorithm::RadonFB, |
| 797 DefaultAlgorithm::SlidingFB, | 800 DefaultAlgorithm::SlidingFB, |
| 798 DefaultAlgorithm::RadonSlidingFB, | 801 DefaultAlgorithm::RadonSlidingFB, |
| 799 DefaultAlgorithm::FW, | 802 DefaultAlgorithm::FW, |
| 800 DefaultAlgorithm::FWRelax, | |
| 801 DefaultAlgorithm::PDPS, | 803 DefaultAlgorithm::PDPS, |
| 802 ], | 804 ], |
| 803 DataTermType::L1 => &[DefaultAlgorithm::PDPS], | 805 DataTermType::L1 => &[DefaultAlgorithm::PDPS], |
| 804 }, | 806 }, |
| 805 )?; | 807 )?; |
