Mercurial > repos > pointsource_algs / file comparison
comparison: src/run.rs
src/run.rs
- branch
- dev
- changeset 63
- 7a8a55fd41c0
- parent 61
- 4f468d35fa29
equal
deleted
inserted
replaced
| 61:4f468d35fa29 | 63:7a8a55fd41c0 |
|---|---|
| 97 let override_merging = |g: SpikeMergingMethod<F>| SpikeMergingMethod { | 97 let override_merging = |g: SpikeMergingMethod<F>| SpikeMergingMethod { |
| 98 enabled: cli.merge.unwrap_or(g.enabled), | 98 enabled: cli.merge.unwrap_or(g.enabled), |
| 99 radius: cli.merge_radius.unwrap_or(g.radius), | 99 radius: cli.merge_radius.unwrap_or(g.radius), |
| 100 interp: cli.merge_interp.unwrap_or(g.interp), | 100 interp: cli.merge_interp.unwrap_or(g.interp), |
| 101 }; | 101 }; |
| 102 let override_inner = |g: InnerSettings<F>| InnerSettings { | |
| 103 method: cli.inner_method.unwrap_or(g.method), | |
| 104 fb_τ0: cli.inner_τ0.unwrap_or(g.fb_τ0), | |
| 105 pdps_τσ0: cli | |
| 106 .inner_pdps_τσ0 | |
| 107 .as_ref() | |
| 108 .map_or(g.pdps_τσ0, |τσ0| (τσ0[0], τσ0[1])), | |
| 109 pp_τ: cli.inner_pp_τ.as_ref().map_or(g.pp_τ, |τ| (τ[0], τ[1])), | |
| 110 tolerance_mult: cli.inner_tol.unwrap_or(g.tolerance_mult), | |
| 111 ..g | |
| 112 }; | |
| 102 let override_fb_generic = |g: InsertionConfig<F>| InsertionConfig { | 113 let override_fb_generic = |g: InsertionConfig<F>| InsertionConfig { |
| 103 bootstrap_insertions: cli | 114 bootstrap_insertions: cli |
| 104 .bootstrap_insertions | 115 .bootstrap_insertions |
| 105 .as_ref() | 116 .as_ref() |
| 106 .map_or(g.bootstrap_insertions, |n| Some((n[0], n[1]))), | 117 .map_or(g.bootstrap_insertions, |n| Some((n[0], n[1]))), |
| 107 merge_every: cli.merge_every.unwrap_or(g.merge_every), | 118 merge_every: cli.merge_every.unwrap_or(g.merge_every), |
| 108 merging: override_merging(g.merging), | 119 merging: override_merging(g.merging), |
| 109 final_merging: cli.final_merging.unwrap_or(g.final_merging), | 120 final_merging: cli.final_merging.unwrap_or(g.final_merging), |
| 110 fitness_merging: cli.fitness_merging.unwrap_or(g.fitness_merging), | 121 fitness_merging: cli.fitness_merging.unwrap_or(g.fitness_merging), |
| 122 inner: override_inner(g.inner), | |
| 111 tolerance: cli | 123 tolerance: cli |
| 112 .tolerance | 124 .tolerance |
| 113 .as_ref() | 125 .as_ref() |
| 114 .map(unpack_tolerance) | 126 .map(unpack_tolerance) |
| 115 .unwrap_or(g.tolerance), | 127 .unwrap_or(g.tolerance), |
