Mercurial > repos > pointsource_algs / file comparison
comparison: src/prox_penalty/radon_squared.rs
src/prox_penalty/radon_squared.rs
- changeset 76
- b921ed0ab99b
- parent 75
- 677a5fd1b014
equal
deleted
inserted
replaced
| 75:677a5fd1b014 | 76:b921ed0ab99b |
|---|---|
| 57 I: AlgIterator, | 57 I: AlgIterator, |
| 58 { | 58 { |
| 59 // If no merging heuristic is used, let's be more conservative about spike insertion, | 59 // If no merging heuristic is used, let's be more conservative about spike insertion, |
| 60 // and skip it after first round. If merging is done, being more greedy about spike | 60 // and skip it after first round. If merging is done, being more greedy about spike |
| 61 // insertion also seems to improve performance. | 61 // insertion also seems to improve performance. |
| 62 let skip_by_rough_check = !config.merging.enabled; | 62 reg.solve_oc_radonsq(μ, τv, τ, ε, config, stats); |
| 63 let violation = reg.find_tolerance_violation(τv, τ, ε, skip_by_rough_check, config); | |
| 64 reg.solve_oc_radonsq(μ, τv, τ, ε, violation, config, stats); | |
| 65 | 63 |
| 66 Ok(true) | 64 Ok(true) |
| 67 } | 65 } |
| 68 | 66 |
| 69 fn reweigh<I>( | 67 fn reweigh<I>( |
