Mercurial > repos > pointsource_algs / file comparison
comparison: src/sliding_pdps.rs
src/sliding_pdps.rs
- branch
- dev
- changeset 62
- 32328a74c790
- parent 61
- 4f468d35fa29
equal
deleted
inserted
replaced
| 61:4f468d35fa29 | 62:32328a74c790 |
|---|---|
| 207 }; | 207 }; |
| 208 // Acceleration is not currently supported | 208 // Acceleration is not currently supported |
| 209 // let γ = dataterm.factor_of_strong_convexity(); | 209 // let γ = dataterm.factor_of_strong_convexity(); |
| 210 let ω = 1.0; | 210 let ω = 1.0; |
| 211 | 211 |
| 212 dbg!(τ, σ_p); | |
| 213 | |
| 212 // We multiply tolerance by τ for FB since our subproblems depending on tolerances are scaled | 214 // We multiply tolerance by τ for FB since our subproblems depending on tolerances are scaled |
| 213 // by τ compared to the conditional gradient approach. | 215 // by τ compared to the conditional gradient approach. |
| 214 let tolerance = config.insertion.tolerance * τ * reg.tolerance_scaling(); | 216 let tolerance = config.insertion.tolerance * τ * reg.tolerance_scaling(); |
| 215 let mut ε = tolerance.initial(); | 217 let mut ε = tolerance.initial(); |
| 216 | 218 |
| 405 let opKz: ZeroOp<Z, Loc<0, F>, _, _, F> = | 407 let opKz: ZeroOp<Z, Loc<0, F>, _, _, F> = |
| 406 ZeroOp::new_dualisable(StaticEuclideanOriginGenerator, z.dual_origin()); | 408 ZeroOp::new_dualisable(StaticEuclideanOriginGenerator, z.dual_origin()); |
| 407 let fnH = Zero::new(); | 409 let fnH = Zero::new(); |
| 408 // Convert config. We don't implement From (that could be done with the o2o crate), as σd0 | 410 // Convert config. We don't implement From (that could be done with the o2o crate), as σd0 |
| 409 // needs to be chosen in a general case; for the problem of this fucntion, anything is valid. | 411 // needs to be chosen in a general case; for the problem of this fucntion, anything is valid. |
| 410 let &SlidingFBConfig { τ0, σp0, insertion, transport, guess } = config; | 412 let &SlidingFBConfig { τ0, σp0, insertion, transport, guess, .. } = config; |
| 411 let pdps_config = SlidingPDPSConfig { τ0, σp0, insertion, transport, guess, σd0: 0.0 }; | 413 let pdps_config = SlidingPDPSConfig { τ0, σp0, insertion, transport, guess, σd0: 0.0 }; |
| 412 | 414 |
| 413 pointsource_sliding_pdps_pair( | 415 pointsource_sliding_pdps_pair( |
| 414 f, | 416 f, |
| 415 reg, | 417 reg, |
