Mercurial > repos > pointsource_algs / file comparison
comparison: src/run.rs
src/run.rs
- changeset 2
- 7a953a87b6c1
- parent 0
- eb3c7813b67a
equal
deleted
inserted
replaced
| 0:eb3c7813b67a | 2:7a953a87b6c1 |
|---|---|
| 55 }; | 55 }; |
| 56 use crate::frank_wolfe::{ | 56 use crate::frank_wolfe::{ |
| 57 FWConfig, | 57 FWConfig, |
| 58 FWVariant, | 58 FWVariant, |
| 59 pointsource_fw, | 59 pointsource_fw, |
| 60 }; | |
| 61 use crate::weight_optim::{ | |
| 60 prepare_optimise_weights, | 62 prepare_optimise_weights, |
| 61 optimise_weights, | 63 optimise_weights_l2, |
| 62 }; | 64 }; |
| 63 use crate::subproblem::InnerSettings; | 65 use crate::subproblem::InnerSettings; |
| 64 use crate::seminorms::*; | 66 use crate::seminorms::*; |
| 65 use crate::plot::*; | 67 use crate::plot::*; |
| 66 use crate::AlgorithmOverrides; | 68 use crate::AlgorithmOverrides; |
| 449 let post_value = match postprocessing { | 451 let post_value = match postprocessing { |
| 450 None => value, | 452 None => value, |
| 451 Some(mut μ) => { | 453 Some(mut μ) => { |
| 452 match dataterm { | 454 match dataterm { |
| 453 DataTerm::L2Squared => { | 455 DataTerm::L2Squared => { |
| 454 optimise_weights( | 456 optimise_weights_l2( |
| 455 &mut μ, &opA, &b, α, &findim_data, &inner_config, | 457 &mut μ, &opA, &b, α, &findim_data, &inner_config, |
| 456 inner_it | 458 inner_it |
| 457 ); | 459 ); |
| 458 dataterm.value_at_residual(opA.apply(&μ) - &b) + α * μ.norm(Radon) | 460 dataterm.value_at_residual(opA.apply(&μ) - &b) + α * μ.norm(Radon) |
| 459 }, | 461 }, |
