Fri, 14 Feb 2025 23:16:14 -0500
Add .cargo/config.toml setting for finding GSL on macos.
32 | 1 | /*! |
2 | Solver for the point source localisation problem using a sliding | |
3 | forward-backward splitting method. | |
4 | */ | |
5 | ||
6 | use numeric_literals::replace_float_literals; | |
7 | use serde::{Serialize, Deserialize}; | |
8 | //use colored::Colorize; | |
9 | //use nalgebra::{DVector, DMatrix}; | |
10 | use itertools::izip; | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
11 | use std::iter::Iterator; |
32 | 12 | |
35 | 13 | use alg_tools::iterate::AlgIteratorFactory; |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
14 | use alg_tools::euclidean::Euclidean; |
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
15 | use alg_tools::mapping::{Mapping, DifferentiableRealMapping, Instance}; |
35 | 16 | use alg_tools::norms::Norm; |
32 | 17 | use alg_tools::nalgebra_support::ToNalgebraRealField; |
18 | ||
19 | use crate::types::*; | |
35 | 20 | use crate::measures::{DiscreteMeasure, Radon, RNDM}; |
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
21 | use crate::measures::merging::SpikeMerging; |
35 | 22 | use crate::forward_model::{ |
23 | ForwardModel, | |
24 | AdjointProductBoundedBy, | |
44 | 25 | BoundedCurvature, |
35 | 26 | }; |
32 | 27 | //use crate::tolerance::Tolerance; |
28 | use crate::plot::{ | |
29 | SeqPlotter, | |
30 | Plotting, | |
31 | PlotLookup | |
32 | }; | |
33 | use crate::fb::*; | |
34 | use crate::regularisation::SlidingRegTerm; | |
35 | use crate::dataterm::{ | |
36 | L2Squared, | |
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
37 | DataTerm, |
32 | 38 | calculate_residual, |
39 | calculate_residual2, | |
40 | }; | |
35 | 41 | //use crate::transport::TransportLipschitz; |
42 | ||
43 | /// Transport settings for [`pointsource_sliding_fb_reg`]. | |
44 | #[derive(Clone, Copy, Eq, PartialEq, Serialize, Deserialize, Debug)] | |
45 | #[serde(default)] | |
46 | pub struct TransportConfig<F : Float> { | |
47 | /// Transport step length $θ$ normalised to $(0, 1)$. | |
48 | pub θ0 : F, | |
49 | /// Factor in $(0, 1)$ for decreasing transport to adapt to tolerance. | |
50 | pub adaptation : F, | |
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
51 | /// A posteriori transport tolerance multiplier (C_pos) |
46 | 52 | pub tolerance_mult_con : F, |
35 | 53 | } |
54 | ||
55 | #[replace_float_literals(F::cast_from(literal))] | |
56 | impl <F : Float> TransportConfig<F> { | |
57 | /// Check that the parameters are ok. Panics if not. | |
58 | pub fn check(&self) { | |
59 | assert!(self.θ0 > 0.0); | |
60 | assert!(0.0 < self.adaptation && self.adaptation < 1.0); | |
46 | 61 | assert!(self.tolerance_mult_con > 0.0); |
35 | 62 | } |
63 | } | |
64 | ||
65 | #[replace_float_literals(F::cast_from(literal))] | |
66 | impl<F : Float> Default for TransportConfig<F> { | |
67 | fn default() -> Self { | |
68 | TransportConfig { | |
45 | 69 | θ0 : 0.9, |
35 | 70 | adaptation : 0.9, |
46 | 71 | tolerance_mult_con : 100.0, |
35 | 72 | } |
73 | } | |
74 | } | |
32 | 75 | |
76 | /// Settings for [`pointsource_sliding_fb_reg`]. | |
77 | #[derive(Clone, Copy, Eq, PartialEq, Serialize, Deserialize, Debug)] | |
78 | #[serde(default)] | |
79 | pub struct SlidingFBConfig<F : Float> { | |
80 | /// Step length scaling | |
81 | pub τ0 : F, | |
35 | 82 | /// Transport parameters |
83 | pub transport : TransportConfig<F>, | |
32 | 84 | /// Generic parameters |
85 | pub insertion : FBGenericConfig<F>, | |
86 | } | |
87 | ||
88 | #[replace_float_literals(F::cast_from(literal))] | |
89 | impl<F : Float> Default for SlidingFBConfig<F> { | |
90 | fn default() -> Self { | |
91 | SlidingFBConfig { | |
92 | τ0 : 0.99, | |
35 | 93 | transport : Default::default(), |
32 | 94 | insertion : Default::default() |
95 | } | |
96 | } | |
97 | } | |
98 | ||
35 | 99 | /// Internal type of adaptive transport step length calculation |
100 | pub(crate) enum TransportStepLength<F : Float, G : Fn(F, F) -> F> { | |
101 | /// Fixed, known step length | |
44 | 102 | #[allow(dead_code)] |
35 | 103 | Fixed(F), |
104 | /// Adaptive step length, only wrt. maximum transport. | |
105 | /// Content of `l` depends on use case, while `g` calculates the step length from `l`. | |
106 | AdaptiveMax{ l : F, max_transport : F, g : G }, | |
107 | /// Adaptive step length. | |
108 | /// Content of `l` depends on use case, while `g` calculates the step length from `l`. | |
109 | FullyAdaptive{ l : F, max_transport : F, g : G }, | |
110 | } | |
111 | ||
41
b6bdb6cb4d44
Remove initial transport adaptation—it is not needed, after all
Tuomo Valkonen <tuomov@iki.fi>
parents:
39
diff
changeset
|
112 | /// Constrution of initial transport `γ1` from initial measure `μ` and `v=F'(μ)` |
b6bdb6cb4d44
Remove initial transport adaptation—it is not needed, after all
Tuomo Valkonen <tuomov@iki.fi>
parents:
39
diff
changeset
|
113 | /// with step lengh τ and transport step length `θ_or_adaptive`. |
32 | 114 | #[replace_float_literals(F::cast_from(literal))] |
41
b6bdb6cb4d44
Remove initial transport adaptation—it is not needed, after all
Tuomo Valkonen <tuomov@iki.fi>
parents:
39
diff
changeset
|
115 | pub(crate) fn initial_transport<F, G, D, const N : usize>( |
35 | 116 | γ1 : &mut RNDM<F, N>, |
117 | μ : &mut RNDM<F, N>, | |
118 | τ : F, | |
119 | θ_or_adaptive : &mut TransportStepLength<F, G>, | |
120 | v : D, | |
121 | ) -> (Vec<F>, RNDM<F, N>) | |
122 | where | |
123 | F : Float + ToNalgebraRealField, | |
124 | G : Fn(F, F) -> F, | |
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
125 | D : DifferentiableRealMapping<F, N>, |
35 | 126 | { |
127 | ||
128 | use TransportStepLength::*; | |
129 | ||
130 | // Save current base point and shift μ to new positions. Idea is that | |
131 | // μ_base(_masses) = μ^k (vector of masses) | |
132 | // μ_base_minus_γ0 = μ^k - π_♯^0γ^{k+1} | |
133 | // γ1 = π_♯^1γ^{k+1} | |
134 | // μ = μ^{k+1} | |
135 | let μ_base_masses : Vec<F> = μ.iter_masses().collect(); | |
136 | let mut μ_base_minus_γ0 = μ.clone(); // Weights will be set in the loop below. | |
137 | // Construct μ^{k+1} and π_♯^1γ^{k+1} initial candidates | |
138 | //let mut sum_norm_dv = 0.0; | |
139 | let γ_prev_len = γ1.len(); | |
140 | assert!(μ.len() >= γ_prev_len); | |
141 | γ1.extend(μ[γ_prev_len..].iter().cloned()); | |
142 | ||
143 | // Calculate initial transport and step length. | |
144 | // First calculate initial transported weights | |
145 | for (δ, ρ) in izip!(μ.iter_spikes(), γ1.iter_spikes_mut()) { | |
146 | // If old transport has opposing sign, the new transport will be none. | |
147 | ρ.α = if (ρ.α > 0.0 && δ.α < 0.0) || (ρ.α < 0.0 && δ.α > 0.0) { | |
148 | 0.0 | |
149 | } else { | |
150 | δ.α | |
151 | }; | |
152 | }; | |
153 | ||
41
b6bdb6cb4d44
Remove initial transport adaptation—it is not needed, after all
Tuomo Valkonen <tuomov@iki.fi>
parents:
39
diff
changeset
|
154 | // Calculate transport rays. |
35 | 155 | match *θ_or_adaptive { |
156 | Fixed(θ) => { | |
157 | let θτ = τ * θ; | |
158 | for (δ, ρ) in izip!(μ.iter_spikes(), γ1.iter_spikes_mut()) { | |
159 | ρ.x = δ.x - v.differential(&δ.x) * (ρ.α.signum() * θτ); | |
160 | } | |
161 | }, | |
44 | 162 | AdaptiveMax{ l : ℓ_F, ref mut max_transport, g : ref calculate_θ } => { |
35 | 163 | *max_transport = max_transport.max(γ1.norm(Radon)); |
44 | 164 | let θτ = τ * calculate_θ(ℓ_F, *max_transport); |
35 | 165 | for (δ, ρ) in izip!(μ.iter_spikes(), γ1.iter_spikes_mut()) { |
166 | ρ.x = δ.x - v.differential(&δ.x) * (ρ.α.signum() * θτ); | |
167 | } | |
168 | }, | |
44 | 169 | FullyAdaptive{ l : ref mut adaptive_ℓ_F, ref mut max_transport, g : ref calculate_θ } => { |
35 | 170 | *max_transport = max_transport.max(γ1.norm(Radon)); |
44 | 171 | let mut θ = calculate_θ(*adaptive_ℓ_F, *max_transport); |
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
172 | // Do two runs through the spikes to update θ, breaking if first run did not cause |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
173 | // a change. |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
174 | for _i in 0..=1 { |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
175 | let mut changes = false; |
35 | 176 | for (δ, ρ) in izip!(μ.iter_spikes(), γ1.iter_spikes_mut()) { |
177 | let dv_x = v.differential(&δ.x); | |
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
178 | let g = &dv_x * (ρ.α.signum() * θ * τ); |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
179 | ρ.x = δ.x - g; |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
180 | let n = g.norm2(); |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
181 | if n >= F::EPSILON { |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
182 | // Estimate Lipschitz factor of ∇v |
44 | 183 | let this_ℓ_F = (dv_x - v.differential(&ρ.x)).norm2() / n; |
184 | *adaptive_ℓ_F = adaptive_ℓ_F.max(this_ℓ_F); | |
185 | θ = calculate_θ(*adaptive_ℓ_F, *max_transport); | |
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
186 | changes = true |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
187 | } |
35 | 188 | } |
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
189 | if !changes { |
35 | 190 | break |
191 | } | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
192 | } |
32 | 193 | } |
35 | 194 | } |
195 | ||
196 | // Set initial guess for μ=μ^{k+1}. | |
197 | for (δ, ρ, &β) in izip!(μ.iter_spikes_mut(), γ1.iter_spikes(), μ_base_masses.iter()) { | |
198 | if ρ.α.abs() > F::EPSILON { | |
199 | δ.x = ρ.x; | |
200 | //δ.α = ρ.α; // already set above | |
201 | } else { | |
202 | δ.α = β; | |
203 | } | |
204 | } | |
205 | // Calculate μ^k-π_♯^0γ^{k+1} and v̆ = A_*(A[μ_transported + μ_transported_base]-b) | |
206 | μ_base_minus_γ0.set_masses(μ_base_masses.iter().zip(γ1.iter_masses()) | |
207 | .map(|(&a,b)| a - b)); | |
208 | (μ_base_masses, μ_base_minus_γ0) | |
209 | } | |
210 | ||
211 | /// A posteriori transport adaptation. | |
212 | #[replace_float_literals(F::cast_from(literal))] | |
213 | pub(crate) fn aposteriori_transport<F, const N : usize>( | |
214 | γ1 : &mut RNDM<F, N>, | |
215 | μ : &mut RNDM<F, N>, | |
216 | μ_base_minus_γ0 : &mut RNDM<F, N>, | |
217 | μ_base_masses : &Vec<F>, | |
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
218 | extra : Option<F>, |
35 | 219 | ε : F, |
220 | tconfig : &TransportConfig<F> | |
221 | ) -> bool | |
222 | where F : Float + ToNalgebraRealField { | |
223 | ||
224 | // 1. If π_♯^1γ^{k+1} = γ1 has non-zero mass at some point y, but μ = μ^{k+1} does not, | |
225 | // then the ansatz ∇w̃_x(y) = w^{k+1}(y) may not be satisfied. So set the mass of γ1 | |
226 | // at that point to zero, and retry. | |
227 | let mut all_ok = true; | |
228 | for (α_μ, α_γ1) in izip!(μ.iter_masses(), γ1.iter_masses_mut()) { | |
229 | if α_μ == 0.0 && *α_γ1 != 0.0 { | |
230 | all_ok = false; | |
231 | *α_γ1 = 0.0; | |
232 | } | |
233 | } | |
234 | ||
235 | // 2. Through bounding ∫ B_ω(y, z) dλ(x, y, z). | |
236 | // through the estimate ≤ C ‖Δ‖‖γ^{k+1}‖ for Δ := μ^{k+1}-μ^k-(π_♯^1-π_♯^0)γ^{k+1}, | |
237 | // which holds for some some C if the convolution kernel in 𝒟 has Lipschitz gradient. | |
238 | let nγ = γ1.norm(Radon); | |
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
239 | let nΔ = μ_base_minus_γ0.norm(Radon) + μ.dist_matching(&γ1) + extra.unwrap_or(0.0); |
46 | 240 | let t = ε * tconfig.tolerance_mult_con; |
35 | 241 | if nγ*nΔ > t { |
242 | // Since t/(nγ*nΔ)<1, and the constant tconfig.adaptation < 1, | |
243 | // this will guarantee that eventually ‖γ‖ decreases sufficiently that we | |
244 | // will not enter here. | |
245 | *γ1 *= tconfig.adaptation * t / ( nγ * nΔ ); | |
246 | all_ok = false | |
247 | } | |
248 | ||
249 | if !all_ok { | |
250 | // Update weights for μ_base_minus_γ0 = μ^k - π_♯^0γ^{k+1} | |
251 | μ_base_minus_γ0.set_masses(μ_base_masses.iter().zip(γ1.iter_masses()) | |
252 | .map(|(&a,b)| a - b)); | |
253 | ||
254 | } | |
255 | ||
256 | all_ok | |
32 | 257 | } |
258 | ||
259 | /// Iteratively solve the pointsource localisation problem using sliding forward-backward | |
260 | /// splitting | |
261 | /// | |
35 | 262 | /// The parametrisation is as for [`pointsource_fb_reg`]. |
32 | 263 | /// Inertia is currently not supported. |
264 | #[replace_float_literals(F::cast_from(literal))] | |
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
265 | pub fn pointsource_sliding_fb_reg<F, I, A, Reg, P, const N : usize>( |
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
266 | opA : &A, |
32 | 267 | b : &A::Observable, |
268 | reg : Reg, | |
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
269 | prox_penalty : &P, |
35 | 270 | config : &SlidingFBConfig<F>, |
32 | 271 | iterator : I, |
272 | mut plotter : SeqPlotter<F, N>, | |
35 | 273 | ) -> RNDM<F, N> |
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
274 | where |
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
275 | F : Float + ToNalgebraRealField, |
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
276 | I : AlgIteratorFactory<IterInfo<F, N>>, |
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
277 | A : ForwardModel<RNDM<F, N>, F> |
44 | 278 | + AdjointProductBoundedBy<RNDM<F, N>, P, FloatType=F> |
279 | + BoundedCurvature<FloatType=F>, | |
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
280 | for<'b> &'b A::Observable : std::ops::Neg<Output=A::Observable> + Instance<A::Observable>, |
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
281 | A::PreadjointCodomain : DifferentiableRealMapping<F, N>, |
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
282 | RNDM<F, N> : SpikeMerging<F>, |
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
283 | Reg : SlidingRegTerm<F, N>, |
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
284 | P : ProxPenalty<F, A::PreadjointCodomain, Reg, N>, |
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
285 | PlotLookup : Plotting<N>, |
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
286 | { |
32 | 287 | |
35 | 288 | // Check parameters |
289 | assert!(config.τ0 > 0.0, "Invalid step length parameter"); | |
290 | config.transport.check(); | |
32 | 291 | |
292 | // Initialise iterates | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
293 | let mut μ = DiscreteMeasure::new(); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
294 | let mut γ1 = DiscreteMeasure::new(); |
35 | 295 | let mut residual = -b; // Has to equal $Aμ-b$. |
296 | ||
297 | // Set up parameters | |
41
b6bdb6cb4d44
Remove initial transport adaptation—it is not needed, after all
Tuomo Valkonen <tuomov@iki.fi>
parents:
39
diff
changeset
|
298 | // let opAnorm = opA.opnorm_bound(Radon, L2); |
35 | 299 | //let max_transport = config.max_transport.scale |
300 | // * reg.radon_norm_bound(b.norm2_squared() / 2.0); | |
301 | //let ℓ = opA.transport.lipschitz_factor(L2Squared) * max_transport; | |
302 | let ℓ = 0.0; | |
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
303 | let τ = config.τ0 / opA.adjoint_product_bound(prox_penalty).unwrap(); |
44 | 304 | let (maybe_ℓ_v0, maybe_transport_lip) = opA.curvature_bound_components(); |
305 | let transport_lip = maybe_transport_lip.unwrap(); | |
306 | let calculate_θ = |ℓ_v, max_transport| { | |
307 | let ℓ_F = ℓ_v + transport_lip * max_transport; | |
308 | config.transport.θ0 / (τ*(ℓ + ℓ_F)) | |
309 | }; | |
310 | let mut θ_or_adaptive = match maybe_ℓ_v0 { | |
311 | //Some(ℓ_v0) => TransportStepLength::Fixed(calculate_θ(ℓ_v0 * b.norm2(), 0.0)), | |
312 | Some(ℓ_v0) => TransportStepLength::AdaptiveMax { | |
313 | l: ℓ_v0 * b.norm2(), // TODO: could estimate computing the real reesidual | |
314 | max_transport : 0.0, | |
315 | g : calculate_θ | |
316 | }, | |
35 | 317 | None => TransportStepLength::FullyAdaptive { |
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
318 | l : 10.0 * F::EPSILON, // Start with something very small to estimate differentials |
35 | 319 | max_transport : 0.0, |
320 | g : calculate_θ | |
321 | }, | |
322 | }; | |
323 | // We multiply tolerance by τ for FB since our subproblems depending on tolerances are scaled | |
324 | // by τ compared to the conditional gradient approach. | |
325 | let tolerance = config.insertion.tolerance * τ * reg.tolerance_scaling(); | |
326 | let mut ε = tolerance.initial(); | |
327 | ||
328 | // Statistics | |
329 | let full_stats = |residual : &A::Observable, | |
330 | μ : &RNDM<F, N>, | |
331 | ε, stats| IterInfo { | |
332 | value : residual.norm2_squared_div2() + reg.apply(μ), | |
333 | n_spikes : μ.len(), | |
334 | ε, | |
335 | // postprocessing: config.insertion.postprocessing.then(|| μ.clone()), | |
336 | .. stats | |
337 | }; | |
32 | 338 | let mut stats = IterInfo::new(); |
339 | ||
340 | // Run the algorithm | |
35 | 341 | for state in iterator.iter_init(|| full_stats(&residual, &μ, ε, stats.clone())) { |
342 | // Calculate initial transport | |
343 | let v = opA.preadjoint().apply(residual); | |
344 | let (μ_base_masses, mut μ_base_minus_γ0) = initial_transport( | |
41
b6bdb6cb4d44
Remove initial transport adaptation—it is not needed, after all
Tuomo Valkonen <tuomov@iki.fi>
parents:
39
diff
changeset
|
345 | &mut γ1, &mut μ, τ, &mut θ_or_adaptive, v |
35 | 346 | ); |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
347 | |
32 | 348 | // Solve finite-dimensional subproblem several times until the dual variable for the |
349 | // regularisation term conforms to the assumptions made for the transport above. | |
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
350 | let (maybe_d, _within_tolerances, mut τv̆) = 'adapt_transport: loop { |
35 | 351 | // Calculate τv̆ = τA_*(A[μ_transported + μ_transported_base]-b) |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
352 | let residual_μ̆ = calculate_residual2(&γ1, &μ_base_minus_γ0, opA, b); |
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
353 | let mut τv̆ = opA.preadjoint().apply(residual_μ̆ * τ); |
32 | 354 | |
355 | // Construct μ^{k+1} by solving finite-dimensional subproblems and insert new spikes. | |
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
356 | let (maybe_d, within_tolerances) = prox_penalty.insert_and_reweigh( |
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
357 | &mut μ, &mut τv̆, &γ1, Some(&μ_base_minus_γ0), |
35 | 358 | τ, ε, &config.insertion, |
359 | ®, &state, &mut stats, | |
32 | 360 | ); |
361 | ||
35 | 362 | // A posteriori transport adaptation. |
363 | if aposteriori_transport( | |
364 | &mut γ1, &mut μ, &mut μ_base_minus_γ0, &μ_base_masses, | |
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
365 | None, |
35 | 366 | ε, &config.transport |
367 | ) { | |
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
368 | break 'adapt_transport (maybe_d, within_tolerances, τv̆) |
32 | 369 | } |
370 | }; | |
371 | ||
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
372 | stats.untransported_fraction = Some({ |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
373 | assert_eq!(μ_base_masses.len(), γ1.len()); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
374 | let (a, b) = stats.untransported_fraction.unwrap_or((0.0, 0.0)); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
375 | let source = μ_base_masses.iter().map(|v| v.abs()).sum(); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
376 | (a + μ_base_minus_γ0.norm(Radon), b + source) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
377 | }); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
378 | stats.transport_error = Some({ |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
379 | assert_eq!(μ_base_masses.len(), γ1.len()); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
380 | let (a, b) = stats.transport_error.unwrap_or((0.0, 0.0)); |
35 | 381 | (a + μ.dist_matching(&γ1), b + γ1.norm(Radon)) |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
382 | }); |
32 | 383 | |
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
384 | // Merge spikes. |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
385 | // This crucially expects the merge routine to be stable with respect to spike locations, |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
386 | // and not to performing any pruning. That is be to done below simultaneously for γ. |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
387 | let ins = &config.insertion; |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
388 | if ins.merge_now(&state) { |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
389 | stats.merged += prox_penalty.merge_spikes( |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
390 | &mut μ, &mut τv̆, &γ1, Some(&μ_base_minus_γ0), τ, ε, ins, ®, |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
391 | Some(|μ̃ : &RNDM<F, N>| L2Squared.calculate_fit_op(μ̃, opA, b)), |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
392 | ); |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
393 | } |
35 | 394 | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
395 | // Prune spikes with zero weight. To maintain correct ordering between μ and γ1, also the |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
396 | // latter needs to be pruned when μ is. |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
397 | // TODO: This could do with a two-vector Vec::retain to avoid copies. |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
398 | let μ_new = DiscreteMeasure::from_iter(μ.iter_spikes().filter(|δ| δ.α != F::ZERO).cloned()); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
399 | if μ_new.len() != μ.len() { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
400 | let mut μ_iter = μ.iter_spikes(); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
401 | γ1.prune_by(|_| μ_iter.next().unwrap().α != F::ZERO); |
35 | 402 | stats.pruned += μ.len() - μ_new.len(); |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
403 | μ = μ_new; |
32 | 404 | } |
405 | ||
406 | // Update residual | |
407 | residual = calculate_residual(&μ, opA, b); | |
408 | ||
35 | 409 | let iter = state.iteration(); |
32 | 410 | stats.this_iters += 1; |
411 | ||
35 | 412 | // Give statistics if requested |
32 | 413 | state.if_verbose(|| { |
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
414 | plotter.plot_spikes(iter, maybe_d.as_ref(), Some(&τv̆), &μ); |
35 | 415 | full_stats(&residual, &μ, ε, std::mem::replace(&mut stats, IterInfo::new())) |
416 | }); | |
32 | 417 | |
35 | 418 | // Update main tolerance for next iteration |
419 | ε = tolerance.update(ε, iter); | |
420 | } | |
421 | ||
422 | postprocess(μ, &config.insertion, L2Squared, opA, b) | |
32 | 423 | } |