Mercurial > repos > pointsource_algs / file comparison
comparison: src/prox_penalty.rs
src/prox_penalty.rs
- changeset 76
- b921ed0ab99b
- parent 75
- 677a5fd1b014
equal
deleted
inserted
replaced
| 75:677a5fd1b014 | 76:b921ed0ab99b |
|---|---|
| 64 pub fitness_merging: bool, | 64 pub fitness_merging: bool, |
| 65 | 65 |
| 66 /// Iterations between merging heuristic tries | 66 /// Iterations between merging heuristic tries |
| 67 pub merge_every: usize, | 67 pub merge_every: usize, |
| 68 | 68 |
| 69 /// Additional weight optimisation steps | 69 /// Conservative insertion strategy |
| 70 pub extra_weight_optimisation_steps: usize, | 70 pub conservative: bool, |
| 71 } | 71 } |
| 72 | 72 |
| 73 #[replace_float_literals(F::cast_from(literal))] | 73 #[replace_float_literals(F::cast_from(literal))] |
| 74 impl<F: Float> Default for InsertionConfig<F> { | 74 impl<F: Float> Default for InsertionConfig<F> { |
| 75 fn default() -> Self { | 75 fn default() -> Self { |
| 85 final_merging: true, | 85 final_merging: true, |
| 86 fitness_merging: false, | 86 fitness_merging: false, |
| 87 merge_every: 10, | 87 merge_every: 10, |
| 88 merge_tolerance_mult: 2.0, | 88 merge_tolerance_mult: 2.0, |
| 89 extra_weight_optimisation_steps: 0, | 89 extra_weight_optimisation_steps: 0, |
| 90 conservative: true, | |
| 90 } | 91 } |
| 91 } | 92 } |
| 92 } | 93 } |
| 93 | 94 |
| 94 impl<F: Float> InsertionConfig<F> { | 95 impl<F: Float> InsertionConfig<F> { |
