Mercurial > repos > pointsource_algs / file comparison
comparison: src/run.rs
src/run.rs
- changeset 77
- be105c046777
- parent 75
- 677a5fd1b014
- child 78
- 2a122736e91c
equal
deleted
inserted
replaced
| 75:677a5fd1b014 | 77:be105c046777 |
|---|---|
| 169 PDPS(pdps, prox) => PDPS( | 169 PDPS(pdps, prox) => PDPS( |
| 170 PDPSConfig { | 170 PDPSConfig { |
| 171 τ0: cli.tau0.unwrap_or(pdps.τ0), | 171 τ0: cli.tau0.unwrap_or(pdps.τ0), |
| 172 σ0: cli.sigma0.unwrap_or(pdps.σ0), | 172 σ0: cli.sigma0.unwrap_or(pdps.σ0), |
| 173 acceleration: cli.acceleration.unwrap_or(pdps.acceleration), | 173 acceleration: cli.acceleration.unwrap_or(pdps.acceleration), |
| 174 generic: override_fb_generic(pdps.generic), | 174 insertion: override_fb_generic(pdps.insertion), |
| 175 ..pdps | 175 ..pdps |
| 176 }, | 176 }, |
| 177 prox, | 177 prox, |
| 178 ), | 178 ), |
| 179 FW(fw) => FW(FWConfig { | 179 FW(fw) => FW(FWConfig { |
| 320 RadonFISTA => AlgorithmConfig::FISTA( | 320 RadonFISTA => AlgorithmConfig::FISTA( |
| 321 FBConfig { insertion: radon_insertion, ..Default::default() }, | 321 FBConfig { insertion: radon_insertion, ..Default::default() }, |
| 322 ProxTerm::RadonSquared, | 322 ProxTerm::RadonSquared, |
| 323 ), | 323 ), |
| 324 RadonPDPS => AlgorithmConfig::PDPS( | 324 RadonPDPS => AlgorithmConfig::PDPS( |
| 325 PDPSConfig { generic: radon_insertion, ..Default::default() }, | 325 PDPSConfig { insertion: radon_insertion, ..Default::default() }, |
| 326 ProxTerm::RadonSquared, | 326 ProxTerm::RadonSquared, |
| 327 ), | 327 ), |
| 328 RadonSlidingFB => AlgorithmConfig::SlidingFB( | 328 RadonSlidingFB => AlgorithmConfig::SlidingFB( |
| 329 SlidingFBConfig { insertion: radon_insertion, ..Default::default() }, | 329 SlidingFBConfig { insertion: radon_insertion, ..Default::default() }, |
| 330 ProxTerm::RadonSquared, | 330 ProxTerm::RadonSquared, |
