Mercurial > repos > pointsource_algs / file comparison
comparison: src/sliding_pdps.rs
src/sliding_pdps.rs
- changeset 99
- 82e3cb274186
- parent 98
- b9818eb24b47
equal
deleted
inserted
replaced
| 98:b9818eb24b47 | 99:82e3cb274186 |
|---|---|
| 225 | 225 |
| 226 let starH = fnH.conjugate(); | 226 let starH = fnH.conjugate(); |
| 227 | 227 |
| 228 // Statistics | 228 // Statistics |
| 229 let full_stats = |μ: &DiscreteMeasure<U, F>, v: &mut S, z: &Z, dz: Z, ε, stats| { | 229 let full_stats = |μ: &DiscreteMeasure<U, F>, v: &mut S, z: &Z, dz: Z, ε, stats| { |
| 230 let discrepancy = reg.discrepancy(v, τ, ε, μ, &config.insertion); | 230 let discrepancy = τ * reg.discrepancy(v, 1.0, ε / τ, μ, &config.insertion); |
| 231 let aux_discrepancy = is_fb.then(|| z.dist2(fnR.prox(σ_p, dz * (-σ_p) + z))); | 231 let aux_discrepancy = is_fb.then(|| z.dist2(fnR.prox(σ_p, dz * (-σ_p) + z))); |
| 232 let joint_discrepancy = aux_discrepancy | 232 let joint_discrepancy = aux_discrepancy |
| 233 .map(|d| (discrepancy.powi(2) + τ * (2.0 / σ_p - l_z) * d.powi(2)).sqrt()); | 233 .map(|d| (discrepancy.powi(2) + τ * (2.0 / σ_p - l_z) * d.powi(2)).sqrt()); |
| 234 IterInfo { | 234 IterInfo { |
| 235 value: f.apply(Pair(μ, z)) | 235 value: f.apply(Pair(μ, z)) |
