Mercurial > repos > pointsource_algs / file comparison
comparison: src/pdps.rs
src/pdps.rs
- changeset 89
- 8d1c959432c8
- parent 78
- 2a122736e91c
- child 91
- 47d495348e38
equal
deleted
inserted
replaced
| 88:51dbb2cc25d9 | 89:8d1c959432c8 |
|---|---|
| 210 | 210 |
| 211 // Prune and possibly merge spikes | 211 // Prune and possibly merge spikes |
| 212 config.if_merge_now(&state, |ins| { | 212 config.if_merge_now(&state, |ins| { |
| 213 stats.merged += | 213 stats.merged += |
| 214 prox_penalty.merge_spikes_no_fitness(&mut μ, &mut τv, &μ_base, τ, ε, ins, ®); | 214 prox_penalty.merge_spikes_no_fitness(&mut μ, &mut τv, &μ_base, τ, ε, ins, ®); |
| 215 }); | 215 Ok(()) |
| 216 })?; | |
| 216 stats.inserted += μ.len() - μ_base.len(); | 217 stats.inserted += μ.len() - μ_base.len(); |
| 217 stats.pruned += prune_with_stats(&mut μ); | 218 stats.pruned += prune_with_stats(&mut μ); |
| 218 | 219 |
| 219 // Update step length parameters | 220 // Update step length parameters |
| 220 let ω = pdpsconfig.acceleration.accelerate(&mut τ, &mut σ, γ); | 221 let ω = pdpsconfig.acceleration.accelerate(&mut τ, &mut σ, γ); |
