Fri, 31 Jan 2025 18:00:17 -0500
curvature controls
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
1 | /*! |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
2 | Regularisation terms |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
3 | */ |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
4 | |
32 | 5 | use numeric_literals::replace_float_literals; |
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
6 | use serde::{Serialize, Deserialize}; |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
7 | use alg_tools::norms::Norm; |
35 | 8 | use alg_tools::linops::Mapping; |
9 | use alg_tools::instance::Instance; | |
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
10 | use alg_tools::loc::Loc; |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
11 | use crate::types::*; |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
12 | use crate::measures::{ |
35 | 13 | RNDM, |
32 | 14 | DeltaMeasure, |
35 | 15 | Radon, |
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
16 | }; |
32 | 17 | use crate::fb::FBGenericConfig; |
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
18 | #[allow(unused_imports)] // Used by documentation. |
32 | 19 | use crate::fb::pointsource_fb_reg; |
20 | #[allow(unused_imports)] // Used by documentation. | |
21 | use crate::sliding_fb::pointsource_sliding_fb_reg; | |
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
22 | |
32 | 23 | use nalgebra::{DVector, DMatrix}; |
24 | use alg_tools::nalgebra_support::ToNalgebraRealField; | |
25 | use alg_tools::bisection_tree::{ | |
26 | BTFN, | |
27 | Bounds, | |
28 | BTSearch, | |
29 | P2Minimise, | |
30 | SupportGenerator, | |
31 | LocalAnalysis, | |
32 | Bounded, | |
33 | }; | |
34 | use crate::subproblem::{ | |
35 | nonneg::quadratic_nonneg, | |
36 | unconstrained::quadratic_unconstrained, | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
37 | l1squared_unconstrained::l1squared_unconstrained, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
38 | l1squared_nonneg::l1squared_nonneg |
32 | 39 | }; |
40 | use alg_tools::iterate::AlgIteratorFactory; | |
41 | ||
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
42 | use std::cmp::Ordering::{Greater, Less, Equal}; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
43 | |
32 | 44 | /// The regularisation term $α\\|μ\\|\_{ℳ(Ω)} + δ_{≥ 0}(μ)$ for [`pointsource_fb_reg`] and other |
45 | /// algorithms. | |
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
46 | /// |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
47 | /// The only member of the struct is the regularisation parameter α. |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
48 | #[derive(Copy, Clone, Debug, Serialize, Deserialize)] |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
49 | pub struct NonnegRadonRegTerm<F : Float>(pub F /* α */); |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
50 | |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
51 | impl<'a, F : Float> NonnegRadonRegTerm<F> { |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
52 | /// Returns the regularisation parameter |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
53 | pub fn α(&self) -> F { |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
54 | let &NonnegRadonRegTerm(α) = self; |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
55 | α |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
56 | } |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
57 | } |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
58 | |
35 | 59 | impl<'a, F : Float, const N : usize> Mapping<RNDM<F, N>> |
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
60 | for NonnegRadonRegTerm<F> { |
35 | 61 | type Codomain = F; |
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
62 | |
35 | 63 | fn apply<I>(&self, μ : I) -> F |
64 | where I : Instance<RNDM<F, N>> { | |
65 | self.α() * μ.eval(|x| x.norm(Radon)) | |
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
66 | } |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
67 | } |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
68 | |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
69 | |
32 | 70 | /// The regularisation term $α\|μ\|_{ℳ(Ω)}$ for [`pointsource_fb_reg`]. |
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
71 | /// |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
72 | /// The only member of the struct is the regularisation parameter α. |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
73 | #[derive(Copy, Clone, Debug, Serialize, Deserialize)] |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
74 | pub struct RadonRegTerm<F : Float>(pub F /* α */); |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
75 | |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
76 | |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
77 | impl<'a, F : Float> RadonRegTerm<F> { |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
78 | /// Returns the regularisation parameter |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
79 | pub fn α(&self) -> F { |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
80 | let &RadonRegTerm(α) = self; |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
81 | α |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
82 | } |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
83 | } |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
84 | |
35 | 85 | impl<'a, F : Float, const N : usize> Mapping<RNDM<F, N>> |
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
86 | for RadonRegTerm<F> { |
35 | 87 | type Codomain = F; |
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
88 | |
35 | 89 | fn apply<I>(&self, μ : I) -> F |
90 | where I : Instance<RNDM<F, N>> { | |
91 | self.α() * μ.eval(|x| x.norm(Radon)) | |
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
92 | } |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
93 | } |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
94 | |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
95 | /// Regularisation term configuration |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
96 | #[derive(Clone, Copy, Eq, PartialEq, Serialize, Deserialize, Debug)] |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
97 | pub enum Regularisation<F : Float> { |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
98 | /// $α \\|μ\\|\_{ℳ(Ω)}$ |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
99 | Radon(F), |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
100 | /// $α\\|μ\\|\_{ℳ(Ω)} + δ_{≥ 0}(μ)$ |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
101 | NonnegRadon(F), |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
102 | } |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
103 | |
35 | 104 | impl<'a, F : Float, const N : usize> Mapping<RNDM<F, N>> |
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
105 | for Regularisation<F> { |
35 | 106 | type Codomain = F; |
107 | ||
108 | fn apply<I>(&self, μ : I) -> F | |
109 | where I : Instance<RNDM<F, N>> { | |
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
110 | match *self { |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
111 | Self::Radon(α) => RadonRegTerm(α).apply(μ), |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
112 | Self::NonnegRadon(α) => NonnegRadonRegTerm(α).apply(μ), |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
113 | } |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
114 | } |
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
115 | } |
32 | 116 | |
35 | 117 | /// Abstraction of regularisation terms. |
32 | 118 | pub trait RegTerm<F : Float + ToNalgebraRealField, const N : usize> |
35 | 119 | : Mapping<RNDM<F, N>, Codomain = F> { |
32 | 120 | /// Approximately solve the problem |
121 | /// <div>$$ | |
122 | /// \min_{x ∈ ℝ^n} \frac{1}{2} x^⊤Ax - g^⊤ x + τ G(x) | |
123 | /// $$</div> | |
124 | /// for $G$ depending on the trait implementation. | |
125 | /// | |
126 | /// The parameter `mA` is $A$. An estimate for its opeator norm should be provided in | |
127 | /// `mA_normest`. The initial iterate and output is `x`. The current main tolerance is `ε`. | |
128 | /// | |
129 | /// Returns the number of iterations taken. | |
130 | fn solve_findim( | |
131 | &self, | |
132 | mA : &DMatrix<F::MixedType>, | |
133 | g : &DVector<F::MixedType>, | |
134 | τ : F, | |
135 | x : &mut DVector<F::MixedType>, | |
136 | mA_normest : F, | |
137 | ε : F, | |
138 | config : &FBGenericConfig<F> | |
139 | ) -> usize; | |
140 | ||
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
141 | /// Approximately solve the problem |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
142 | /// <div>$$ |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
143 | /// \min_{x ∈ ℝ^n} \frac{1}{2} |x-y|_1^2 - g^⊤ x + τ G(x) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
144 | /// $$</div> |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
145 | /// for $G$ depending on the trait implementation. |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
146 | /// |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
147 | /// Returns the number of iterations taken. |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
148 | fn solve_findim_l1squared( |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
149 | &self, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
150 | y : &DVector<F::MixedType>, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
151 | g : &DVector<F::MixedType>, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
152 | τ : F, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
153 | x : &mut DVector<F::MixedType>, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
154 | ε : F, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
155 | config : &FBGenericConfig<F> |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
156 | ) -> usize; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
157 | |
32 | 158 | /// Find a point where `d` may violate the tolerance `ε`. |
159 | /// | |
160 | /// If `skip_by_rough_check` is set, do not find the point if a rough check indicates that we | |
161 | /// are in bounds. `ε` is the current main tolerance and `τ` a scaling factor for the | |
162 | /// regulariser. | |
163 | /// | |
164 | /// Returns `None` if `d` is in bounds either based on the rough check, or a more precise check | |
165 | /// terminating early. Otherwise returns a possibly violating point, the value of `d` there, | |
166 | /// and a boolean indicating whether the found point is in bounds. | |
167 | fn find_tolerance_violation<G, BT>( | |
168 | &self, | |
169 | d : &mut BTFN<F, G, BT, N>, | |
170 | τ : F, | |
171 | ε : F, | |
172 | skip_by_rough_check : bool, | |
173 | config : &FBGenericConfig<F>, | |
174 | ) -> Option<(Loc<F, N>, F, bool)> | |
175 | where BT : BTSearch<F, N, Agg=Bounds<F>>, | |
176 | G : SupportGenerator<F, N, Id=BT::Data>, | |
35 | 177 | G::SupportType : Mapping<Loc<F, N>, Codomain=F> + LocalAnalysis<F, Bounds<F>, N> { |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
178 | self.find_tolerance_violation_slack(d, τ, ε, skip_by_rough_check, config, F::ZERO) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
179 | } |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
180 | |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
181 | /// Find a point where `d` may violate the tolerance `ε`. |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
182 | /// |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
183 | /// This version includes a `slack` parameter to expand the tolerances. |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
184 | /// It is used for Radon-norm squared proximal term in [`crate::radon_fb`]. |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
185 | /// |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
186 | /// If `skip_by_rough_check` is set, do not find the point if a rough check indicates that we |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
187 | /// are in bounds. `ε` is the current main tolerance and `τ` a scaling factor for the |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
188 | /// regulariser. |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
189 | /// |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
190 | /// Returns `None` if `d` is in bounds either based on the rough check, or a more precise check |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
191 | /// terminating early. Otherwise returns a possibly violating point, the value of `d` there, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
192 | /// and a boolean indicating whether the found point is in bounds. |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
193 | fn find_tolerance_violation_slack<G, BT>( |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
194 | &self, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
195 | d : &mut BTFN<F, G, BT, N>, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
196 | τ : F, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
197 | ε : F, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
198 | skip_by_rough_check : bool, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
199 | config : &FBGenericConfig<F>, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
200 | slack : F, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
201 | ) -> Option<(Loc<F, N>, F, bool)> |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
202 | where BT : BTSearch<F, N, Agg=Bounds<F>>, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
203 | G : SupportGenerator<F, N, Id=BT::Data>, |
35 | 204 | G::SupportType : Mapping<Loc<F, N>, Codomain=F> + LocalAnalysis<F, Bounds<F>, N>; |
32 | 205 | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
206 | |
32 | 207 | /// Verify that `d` is in bounds `ε` for a merge candidate `μ` |
208 | /// | |
209 | /// `ε` is the current main tolerance and `τ` a scaling factor for the regulariser. | |
210 | fn verify_merge_candidate<G, BT>( | |
211 | &self, | |
212 | d : &mut BTFN<F, G, BT, N>, | |
35 | 213 | μ : &RNDM<F, N>, |
32 | 214 | τ : F, |
215 | ε : F, | |
216 | config : &FBGenericConfig<F>, | |
217 | ) -> bool | |
218 | where BT : BTSearch<F, N, Agg=Bounds<F>>, | |
219 | G : SupportGenerator<F, N, Id=BT::Data>, | |
35 | 220 | G::SupportType : Mapping<Loc<F, N>, Codomain=F> + LocalAnalysis<F, Bounds<F>, N>; |
32 | 221 | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
222 | /// Verify that `d` is in bounds `ε` for a merge candidate `μ` |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
223 | /// |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
224 | /// This version is s used for Radon-norm squared proximal term in [`crate::radon_fb`]. |
35 | 225 | /// The [measures][crate::measures::DiscreteMeasure] `μ` and `radon_μ` are supposed to have |
226 | /// same coordinates at same agreeing indices. | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
227 | /// |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
228 | /// `ε` is the current main tolerance and `τ` a scaling factor for the regulariser. |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
229 | fn verify_merge_candidate_radonsq<G, BT>( |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
230 | &self, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
231 | d : &mut BTFN<F, G, BT, N>, |
35 | 232 | μ : &RNDM<F, N>, |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
233 | τ : F, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
234 | ε : F, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
235 | config : &FBGenericConfig<F>, |
35 | 236 | radon_μ :&RNDM<F, N>, |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
237 | ) -> bool |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
238 | where BT : BTSearch<F, N, Agg=Bounds<F>>, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
239 | G : SupportGenerator<F, N, Id=BT::Data>, |
35 | 240 | G::SupportType : Mapping<Loc<F, N>, Codomain=F> + LocalAnalysis<F, Bounds<F>, N>; |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
241 | |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
242 | |
32 | 243 | /// TODO: document this |
244 | fn target_bounds(&self, τ : F, ε : F) -> Option<Bounds<F>>; | |
245 | ||
246 | /// Returns a scaling factor for the tolerance sequence. | |
247 | /// | |
248 | /// Typically this is the regularisation parameter. | |
249 | fn tolerance_scaling(&self) -> F; | |
250 | } | |
251 | ||
252 | /// Abstraction of regularisation terms for [`pointsource_sliding_fb_reg`]. | |
253 | pub trait SlidingRegTerm<F : Float + ToNalgebraRealField, const N : usize> | |
254 | : RegTerm<F, N> { | |
255 | /// Calculate $τ[w(z) - w(y)]$ for some w in the subdifferential of the regularisation | |
256 | /// term, such that $-ε ≤ τw - d ≤ ε$. | |
257 | fn goodness<G, BT>( | |
258 | &self, | |
259 | d : &mut BTFN<F, G, BT, N>, | |
35 | 260 | μ : &RNDM<F, N>, |
32 | 261 | y : &Loc<F, N>, |
262 | z : &Loc<F, N>, | |
263 | τ : F, | |
264 | ε : F, | |
265 | config : &FBGenericConfig<F>, | |
266 | ) -> F | |
267 | where BT : BTSearch<F, N, Agg=Bounds<F>>, | |
268 | G : SupportGenerator<F, N, Id=BT::Data>, | |
35 | 269 | G::SupportType : Mapping<Loc<F, N>, Codomain=F> + LocalAnalysis<F, Bounds<F>, N>; |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
270 | |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
271 | /// Convert bound on the regulariser to a bond on the Radon norm |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
272 | fn radon_norm_bound(&self, b : F) -> F; |
32 | 273 | } |
274 | ||
275 | #[replace_float_literals(F::cast_from(literal))] | |
276 | impl<F : Float + ToNalgebraRealField, const N : usize> RegTerm<F, N> | |
277 | for NonnegRadonRegTerm<F> | |
278 | where Cube<F, N> : P2Minimise<Loc<F, N>, F> { | |
279 | fn solve_findim( | |
280 | &self, | |
281 | mA : &DMatrix<F::MixedType>, | |
282 | g : &DVector<F::MixedType>, | |
283 | τ : F, | |
284 | x : &mut DVector<F::MixedType>, | |
285 | mA_normest : F, | |
286 | ε : F, | |
287 | config : &FBGenericConfig<F> | |
288 | ) -> usize { | |
289 | let inner_tolerance = ε * config.inner.tolerance_mult; | |
290 | let inner_it = config.inner.iterator_options.stop_target(inner_tolerance); | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
291 | quadratic_nonneg(mA, g, τ * self.α(), x, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
292 | mA_normest, &config.inner, inner_it) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
293 | |
32 | 294 | } |
295 | ||
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
296 | fn solve_findim_l1squared( |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
297 | &self, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
298 | y : &DVector<F::MixedType>, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
299 | g : &DVector<F::MixedType>, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
300 | τ : F, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
301 | x : &mut DVector<F::MixedType>, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
302 | ε : F, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
303 | config : &FBGenericConfig<F> |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
304 | ) -> usize { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
305 | let inner_tolerance = ε * config.inner.tolerance_mult; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
306 | let inner_it = config.inner.iterator_options.stop_target(inner_tolerance); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
307 | l1squared_nonneg(y, g, τ * self.α(), 1.0, x, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
308 | &config.inner, inner_it) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
309 | } |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
310 | |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
311 | |
32 | 312 | #[inline] |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
313 | fn find_tolerance_violation_slack<G, BT>( |
32 | 314 | &self, |
315 | d : &mut BTFN<F, G, BT, N>, | |
316 | τ : F, | |
317 | ε : F, | |
318 | skip_by_rough_check : bool, | |
319 | config : &FBGenericConfig<F>, | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
320 | slack : F |
32 | 321 | ) -> Option<(Loc<F, N>, F, bool)> |
322 | where BT : BTSearch<F, N, Agg=Bounds<F>>, | |
323 | G : SupportGenerator<F, N, Id=BT::Data>, | |
35 | 324 | G::SupportType : Mapping<Loc<F, N>, Codomain=F> + LocalAnalysis<F, Bounds<F>, N> { |
32 | 325 | let τα = τ * self.α(); |
35 | 326 | let keep_above = -τα - slack - ε; |
327 | let minimise_below = -τα - slack - ε * config.insertion_cutoff_factor; | |
32 | 328 | let refinement_tolerance = ε * config.refinement.tolerance_mult; |
329 | ||
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
330 | // If preliminary check indicates that we are in bounds, and if it otherwise matches |
32 | 331 | // the insertion strategy, skip insertion. |
35 | 332 | if skip_by_rough_check && d.bounds().lower() >= keep_above { |
32 | 333 | None |
334 | } else { | |
35 | 335 | // If the rough check didn't indicate no insertion needed, find minimising point. |
336 | d.minimise_below(minimise_below, refinement_tolerance, config.refinement.max_steps) | |
337 | .map(|(ξ, v_ξ)| (ξ, v_ξ, v_ξ >= keep_above)) | |
32 | 338 | } |
339 | } | |
340 | ||
341 | fn verify_merge_candidate<G, BT>( | |
342 | &self, | |
343 | d : &mut BTFN<F, G, BT, N>, | |
35 | 344 | μ : &RNDM<F, N>, |
32 | 345 | τ : F, |
346 | ε : F, | |
347 | config : &FBGenericConfig<F>, | |
348 | ) -> bool | |
349 | where BT : BTSearch<F, N, Agg=Bounds<F>>, | |
350 | G : SupportGenerator<F, N, Id=BT::Data>, | |
35 | 351 | G::SupportType : Mapping<Loc<F, N>, Codomain=F> + LocalAnalysis<F, Bounds<F>, N> { |
32 | 352 | let τα = τ * self.α(); |
353 | let refinement_tolerance = ε * config.refinement.tolerance_mult; | |
354 | let merge_tolerance = config.merge_tolerance_mult * ε; | |
35 | 355 | let keep_above = -τα - merge_tolerance; |
356 | let keep_supp_below = -τα + merge_tolerance; | |
32 | 357 | let bnd = d.bounds(); |
358 | ||
359 | return ( | |
35 | 360 | bnd.upper() <= keep_supp_below |
32 | 361 | || |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
362 | μ.iter_spikes().all(|&DeltaMeasure{ α, ref x }| { |
35 | 363 | (α == 0.0) || d.apply(x) <= keep_supp_below |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
364 | }) |
32 | 365 | ) && ( |
35 | 366 | bnd.lower() >= keep_above |
32 | 367 | || |
35 | 368 | d.has_lower_bound(keep_above, refinement_tolerance, config.refinement.max_steps) |
32 | 369 | ) |
370 | } | |
371 | ||
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
372 | fn verify_merge_candidate_radonsq<G, BT>( |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
373 | &self, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
374 | d : &mut BTFN<F, G, BT, N>, |
35 | 375 | μ : &RNDM<F, N>, |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
376 | τ : F, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
377 | ε : F, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
378 | config : &FBGenericConfig<F>, |
35 | 379 | radon_μ :&RNDM<F, N>, |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
380 | ) -> bool |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
381 | where BT : BTSearch<F, N, Agg=Bounds<F>>, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
382 | G : SupportGenerator<F, N, Id=BT::Data>, |
35 | 383 | G::SupportType : Mapping<Loc<F, N>, Codomain=F> + LocalAnalysis<F, Bounds<F>, N> { |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
384 | let τα = τ * self.α(); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
385 | let refinement_tolerance = ε * config.refinement.tolerance_mult; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
386 | let merge_tolerance = config.merge_tolerance_mult * ε; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
387 | let slack = radon_μ.norm(Radon); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
388 | let bnd = d.bounds(); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
389 | |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
390 | return { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
391 | μ.both_matching(radon_μ) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
392 | .all(|(α, rα, x)| { |
35 | 393 | let v = -d.apply(x); // TODO: observe ad hoc negation here, after minus_τv |
394 | // switch to τv. | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
395 | let (l1, u1) = match α.partial_cmp(&0.0).unwrap_or(Equal) { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
396 | Greater => (τα, τα), |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
397 | _ => (F::NEG_INFINITY, τα), |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
398 | // Less should not happen; treated as Equal |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
399 | }; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
400 | let (l2, u2) = match rα.partial_cmp(&0.0).unwrap_or(Equal) { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
401 | Greater => (slack, slack), |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
402 | Equal => (-slack, slack), |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
403 | Less => (-slack, -slack), |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
404 | }; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
405 | // TODO: both fail. |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
406 | (l1 + l2 - merge_tolerance <= v) && (v <= u1 + u2 + merge_tolerance) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
407 | }) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
408 | } && { |
35 | 409 | let keep_above = -τα - slack - merge_tolerance; |
410 | bnd.lower() <= keep_above | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
411 | || |
35 | 412 | d.has_lower_bound(keep_above, refinement_tolerance, config.refinement.max_steps) |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
413 | } |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
414 | } |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
415 | |
32 | 416 | fn target_bounds(&self, τ : F, ε : F) -> Option<Bounds<F>> { |
417 | let τα = τ * self.α(); | |
418 | Some(Bounds(τα - ε, τα + ε)) | |
419 | } | |
420 | ||
421 | fn tolerance_scaling(&self) -> F { | |
422 | self.α() | |
423 | } | |
424 | } | |
425 | ||
426 | #[replace_float_literals(F::cast_from(literal))] | |
427 | impl<F : Float + ToNalgebraRealField, const N : usize> SlidingRegTerm<F, N> | |
428 | for NonnegRadonRegTerm<F> | |
429 | where Cube<F, N> : P2Minimise<Loc<F, N>, F> { | |
430 | ||
431 | fn goodness<G, BT>( | |
432 | &self, | |
433 | d : &mut BTFN<F, G, BT, N>, | |
35 | 434 | _μ : &RNDM<F, N>, |
32 | 435 | y : &Loc<F, N>, |
436 | z : &Loc<F, N>, | |
437 | τ : F, | |
438 | ε : F, | |
439 | _config : &FBGenericConfig<F>, | |
440 | ) -> F | |
441 | where BT : BTSearch<F, N, Agg=Bounds<F>>, | |
442 | G : SupportGenerator<F, N, Id=BT::Data>, | |
35 | 443 | G::SupportType : Mapping<Loc<F, N>, Codomain=F> + LocalAnalysis<F, Bounds<F>, N> { |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
444 | let w = |x| 1.0.min((ε + d.apply(x))/(τ * self.α())); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
445 | w(z) - w(y) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
446 | } |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
447 | |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
448 | fn radon_norm_bound(&self, b : F) -> F { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
449 | b / self.α() |
32 | 450 | } |
451 | } | |
452 | ||
453 | #[replace_float_literals(F::cast_from(literal))] | |
454 | impl<F : Float + ToNalgebraRealField, const N : usize> RegTerm<F, N> for RadonRegTerm<F> | |
455 | where Cube<F, N> : P2Minimise<Loc<F, N>, F> { | |
456 | fn solve_findim( | |
457 | &self, | |
458 | mA : &DMatrix<F::MixedType>, | |
459 | g : &DVector<F::MixedType>, | |
460 | τ : F, | |
461 | x : &mut DVector<F::MixedType>, | |
462 | mA_normest: F, | |
463 | ε : F, | |
464 | config : &FBGenericConfig<F> | |
465 | ) -> usize { | |
466 | let inner_tolerance = ε * config.inner.tolerance_mult; | |
467 | let inner_it = config.inner.iterator_options.stop_target(inner_tolerance); | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
468 | quadratic_unconstrained(mA, g, τ * self.α(), x, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
469 | mA_normest, &config.inner, inner_it) |
32 | 470 | } |
471 | ||
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
472 | fn solve_findim_l1squared( |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
473 | &self, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
474 | y : &DVector<F::MixedType>, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
475 | g : &DVector<F::MixedType>, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
476 | τ : F, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
477 | x : &mut DVector<F::MixedType>, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
478 | ε : F, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
479 | config : &FBGenericConfig<F> |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
480 | ) -> usize { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
481 | let inner_tolerance = ε * config.inner.tolerance_mult; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
482 | let inner_it = config.inner.iterator_options.stop_target(inner_tolerance); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
483 | l1squared_unconstrained(y, g, τ * self.α(), 1.0, x, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
484 | &config.inner, inner_it) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
485 | } |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
486 | |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
487 | fn find_tolerance_violation_slack<G, BT>( |
32 | 488 | &self, |
489 | d : &mut BTFN<F, G, BT, N>, | |
490 | τ : F, | |
491 | ε : F, | |
492 | skip_by_rough_check : bool, | |
493 | config : &FBGenericConfig<F>, | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
494 | slack : F, |
32 | 495 | ) -> Option<(Loc<F, N>, F, bool)> |
496 | where BT : BTSearch<F, N, Agg=Bounds<F>>, | |
497 | G : SupportGenerator<F, N, Id=BT::Data>, | |
35 | 498 | G::SupportType : Mapping<Loc<F, N>, Codomain=F> + LocalAnalysis<F, Bounds<F>, N> { |
32 | 499 | let τα = τ * self.α(); |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
500 | let keep_below = τα + slack + ε; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
501 | let keep_above = -(τα + slack) - ε; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
502 | let maximise_above = τα + slack + ε * config.insertion_cutoff_factor; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
503 | let minimise_below = -(τα + slack) - ε * config.insertion_cutoff_factor; |
32 | 504 | let refinement_tolerance = ε * config.refinement.tolerance_mult; |
505 | ||
506 | // If preliminary check indicates that we are in bonds, and if it otherwise matches | |
507 | // the insertion strategy, skip insertion. | |
508 | if skip_by_rough_check && Bounds(keep_above, keep_below).superset(&d.bounds()) { | |
509 | None | |
510 | } else { | |
511 | // If the rough check didn't indicate no insertion needed, find maximising point. | |
512 | let mx = d.maximise_above(maximise_above, refinement_tolerance, | |
513 | config.refinement.max_steps); | |
514 | let mi = d.minimise_below(minimise_below, refinement_tolerance, | |
515 | config.refinement.max_steps); | |
516 | ||
517 | match (mx, mi) { | |
518 | (None, None) => None, | |
519 | (Some((ξ, v_ξ)), None) => Some((ξ, v_ξ, keep_below >= v_ξ)), | |
520 | (None, Some((ζ, v_ζ))) => Some((ζ, v_ζ, keep_above <= v_ζ)), | |
521 | (Some((ξ, v_ξ)), Some((ζ, v_ζ))) => { | |
522 | if v_ξ - τα > τα - v_ζ { | |
523 | Some((ξ, v_ξ, keep_below >= v_ξ)) | |
524 | } else { | |
525 | Some((ζ, v_ζ, keep_above <= v_ζ)) | |
526 | } | |
527 | } | |
528 | } | |
529 | } | |
530 | } | |
531 | ||
532 | fn verify_merge_candidate<G, BT>( | |
533 | &self, | |
534 | d : &mut BTFN<F, G, BT, N>, | |
35 | 535 | μ : &RNDM<F, N>, |
32 | 536 | τ : F, |
537 | ε : F, | |
538 | config : &FBGenericConfig<F>, | |
539 | ) -> bool | |
540 | where BT : BTSearch<F, N, Agg=Bounds<F>>, | |
541 | G : SupportGenerator<F, N, Id=BT::Data>, | |
35 | 542 | G::SupportType : Mapping<Loc<F, N>,Codomain=F> + LocalAnalysis<F, Bounds<F>, N> { |
32 | 543 | let τα = τ * self.α(); |
544 | let refinement_tolerance = ε * config.refinement.tolerance_mult; | |
545 | let merge_tolerance = config.merge_tolerance_mult * ε; | |
546 | let keep_below = τα + merge_tolerance; | |
547 | let keep_above = -τα - merge_tolerance; | |
548 | let keep_supp_pos_above = τα - merge_tolerance; | |
549 | let keep_supp_neg_below = -τα + merge_tolerance; | |
550 | let bnd = d.bounds(); | |
551 | ||
552 | return ( | |
553 | (bnd.lower() >= keep_supp_pos_above && bnd.upper() <= keep_supp_neg_below) | |
554 | || | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
555 | μ.iter_spikes().all(|&DeltaMeasure{ α : β, ref x }| { |
32 | 556 | match β.partial_cmp(&0.0) { |
557 | Some(Greater) => d.apply(x) >= keep_supp_pos_above, | |
558 | Some(Less) => d.apply(x) <= keep_supp_neg_below, | |
559 | _ => true, | |
560 | } | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
561 | }) |
32 | 562 | ) && ( |
563 | bnd.upper() <= keep_below | |
564 | || | |
565 | d.has_upper_bound(keep_below, refinement_tolerance, | |
566 | config.refinement.max_steps) | |
567 | ) && ( | |
568 | bnd.lower() >= keep_above | |
569 | || | |
570 | d.has_lower_bound(keep_above, refinement_tolerance, | |
571 | config.refinement.max_steps) | |
572 | ) | |
573 | } | |
574 | ||
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
575 | fn verify_merge_candidate_radonsq<G, BT>( |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
576 | &self, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
577 | d : &mut BTFN<F, G, BT, N>, |
35 | 578 | μ : &RNDM<F, N>, |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
579 | τ : F, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
580 | ε : F, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
581 | config : &FBGenericConfig<F>, |
35 | 582 | radon_μ : &RNDM<F, N>, |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
583 | ) -> bool |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
584 | where BT : BTSearch<F, N, Agg=Bounds<F>>, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
585 | G : SupportGenerator<F, N, Id=BT::Data>, |
35 | 586 | G::SupportType : Mapping<Loc<F, N>,Codomain=F> + LocalAnalysis<F, Bounds<F>, N> { |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
587 | let τα = τ * self.α(); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
588 | let refinement_tolerance = ε * config.refinement.tolerance_mult; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
589 | let merge_tolerance = config.merge_tolerance_mult * ε; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
590 | let slack = radon_μ.norm(Radon); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
591 | let bnd = d.bounds(); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
592 | |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
593 | return { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
594 | μ.both_matching(radon_μ) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
595 | .all(|(α, rα, x)| { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
596 | let v = d.apply(x); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
597 | let (l1, u1) = match α.partial_cmp(&0.0).unwrap_or(Equal) { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
598 | Greater => (τα, τα), |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
599 | Equal => (-τα, τα), |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
600 | Less => (-τα, -τα), |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
601 | }; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
602 | let (l2, u2) = match rα.partial_cmp(&0.0).unwrap_or(Equal) { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
603 | Greater => (slack, slack), |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
604 | Equal => (-slack, slack), |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
605 | Less => (-slack, -slack), |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
606 | }; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
607 | (l1 + l2 - merge_tolerance <= v) && (v <= u1 + u2 + merge_tolerance) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
608 | }) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
609 | } && { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
610 | let keep_below = τα + slack + merge_tolerance; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
611 | bnd.upper() <= keep_below |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
612 | || |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
613 | d.has_upper_bound(keep_below, refinement_tolerance, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
614 | config.refinement.max_steps) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
615 | } && { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
616 | let keep_above = -τα - slack - merge_tolerance; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
617 | bnd.lower() >= keep_above |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
618 | || |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
619 | d.has_lower_bound(keep_above, refinement_tolerance, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
620 | config.refinement.max_steps) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
621 | } |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
622 | } |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
623 | |
32 | 624 | fn target_bounds(&self, τ : F, ε : F) -> Option<Bounds<F>> { |
625 | let τα = τ * self.α(); | |
626 | Some(Bounds(-τα - ε, τα + ε)) | |
627 | } | |
628 | ||
629 | fn tolerance_scaling(&self) -> F { | |
630 | self.α() | |
631 | } | |
632 | } | |
633 | ||
634 | #[replace_float_literals(F::cast_from(literal))] | |
635 | impl<F : Float + ToNalgebraRealField, const N : usize> SlidingRegTerm<F, N> | |
636 | for RadonRegTerm<F> | |
637 | where Cube<F, N> : P2Minimise<Loc<F, N>, F> { | |
638 | ||
639 | fn goodness<G, BT>( | |
640 | &self, | |
641 | d : &mut BTFN<F, G, BT, N>, | |
35 | 642 | _μ : &RNDM<F, N>, |
32 | 643 | y : &Loc<F, N>, |
644 | z : &Loc<F, N>, | |
645 | τ : F, | |
646 | ε : F, | |
647 | _config : &FBGenericConfig<F>, | |
648 | ) -> F | |
649 | where BT : BTSearch<F, N, Agg=Bounds<F>>, | |
650 | G : SupportGenerator<F, N, Id=BT::Data>, | |
651 | G::SupportType : Mapping<Loc<F, N>,Codomain=F> | |
652 | + LocalAnalysis<F, Bounds<F>, N> { | |
653 | ||
654 | let α = self.α(); | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
655 | let w = |x| { |
32 | 656 | let dx = d.apply(x); |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
657 | ((-ε + dx)/(τ * α)).max(1.0.min(ε + dx)/(τ * α)) |
32 | 658 | }; |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
659 | w(z) - w(y) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
660 | } |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
661 | |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
662 | fn radon_norm_bound(&self, b : F) -> F { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
663 | b / self.α() |
32 | 664 | } |
665 | } |