Thu, 23 Jan 2025 23:34:05 +0100
Merging adjustments, parameter tuning, etc.
0 | 1 | /*! |
2 | Spike merging heuristics for [`DiscreteMeasure`]s. | |
3 | ||
4 | This module primarily provides the [`SpikeMerging`] trait, and within it, | |
5 | the [`SpikeMerging::merge_spikes`] method. The trait is implemented on | |
6 | [`DiscreteMeasure<Loc<F, N>, F>`]s in dimensions `N=1` and `N=2`. | |
7 | */ | |
8 | ||
9 | use numeric_literals::replace_float_literals; | |
10 | use std::cmp::Ordering; | |
11 | use serde::{Serialize, Deserialize}; | |
12 | //use clap::builder::{PossibleValuesParser, PossibleValue}; | |
13 | use alg_tools::nanleast::NaNLeast; | |
14 | ||
15 | use crate::types::*; | |
16 | use super::delta::*; | |
17 | use super::discrete::*; | |
18 | ||
19 | /// Spike merging heuristic selection | |
20 | #[derive(Clone, Copy, Eq, PartialEq, Serialize, Deserialize, Debug)] | |
21 | #[allow(dead_code)] | |
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
22 | pub struct SpikeMergingMethod<F> { |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
23 | // Merging radius |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
24 | pub(crate) radius : F, |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
25 | // Enabled |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
26 | pub(crate) enabled : bool, |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
27 | // Interpolate merged points |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
28 | pub(crate) interp : bool, |
0 | 29 | } |
30 | ||
31 | ||
32 | #[replace_float_literals(F::cast_from(literal))] | |
33 | impl<F : Float> Default for SpikeMergingMethod<F> { | |
34 | fn default() -> Self { | |
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
35 | SpikeMergingMethod{ |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
36 | radius : 0.01, |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
37 | enabled : false, |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
38 | interp : true, |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
39 | } |
0 | 40 | } |
41 | } | |
42 | ||
43 | /// Trait for dimension-dependent implementation of heuristic peak merging strategies. | |
44 | pub trait SpikeMerging<F> { | |
45 | /// Attempt spike merging according to [`SpikeMerging`] method. | |
46 | /// | |
47 | /// Returns the last [`Some`] returned by the merging candidate acceptance decision closure | |
48 | /// `accept` if any merging is performed. The closure should accept as its only parameter a | |
49 | /// new candidate measure (it will generally be internally mutated `self`, although this is | |
50 | /// not guaranteed), and return [`None`] if the merge is accepted, and otherwise a [`Some`] of | |
51 | /// an arbitrary value. This method will return that value for the *last* accepted merge, or | |
52 | /// [`None`] if no merge was accepted. | |
53 | /// | |
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
54 | /// This method is stable with respect to spike locations: on merge, the weights of existing |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
55 | /// removed spikes is set to zero, new ones inserted at the end of the spike vector. |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
56 | /// They merge may also be performed by increasing the weights of the existing spikes, |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
57 | /// without inserting new spikes. |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
58 | fn merge_spikes<G>(&mut self, method : SpikeMergingMethod<F>, accept : G) -> usize |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
59 | where G : FnMut(&'_ Self) -> bool { |
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
60 | if method.enabled { |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
61 | self.do_merge_spikes_radius(method.radius, method.interp, accept) |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
62 | } else { |
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
34
diff
changeset
|
63 | 0 |
0 | 64 | } |
65 | } | |
66 | ||
67 | /// Attempt to merge spikes based on a value and a fitness function. | |
68 | /// | |
69 | /// Calls [`SpikeMerging::merge_spikes`] with `accept` constructed from the composition of | |
70 | /// `value` and `fitness`, compared to initial fitness. Returns the last return value of `value` | |
71 | // for a merge accepted by `fitness`. If no merge was accepted, `value` applied to the initial | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
72 | /// `self` is returned. also the number of merges is returned; |
0 | 73 | fn merge_spikes_fitness<G, H, V, O>( |
74 | &mut self, | |
75 | method : SpikeMergingMethod<F>, | |
76 | value : G, | |
77 | fitness : H | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
78 | ) -> (V, usize) |
0 | 79 | where G : Fn(&'_ Self) -> V, |
80 | H : Fn(&'_ V) -> O, | |
81 | O : PartialOrd { | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
82 | let mut res = value(self); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
83 | let initial_fitness = fitness(&res); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
84 | let count = self.merge_spikes(method, |μ| { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
85 | res = value(μ); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
86 | fitness(&res) <= initial_fitness |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
87 | }); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
88 | (res, count) |
0 | 89 | } |
90 | ||
91 | /// Attempt to merge spikes that are within radius $ρ$ of each other (unspecified norm). | |
92 | /// | |
93 | /// This method implements [`SpikeMerging::merge_spikes`] for | |
94 | /// [`SpikeMergingMethod::HeuristicRadius`]. The closure `accept` and the return value are | |
95 | /// as for that method. | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
96 | fn do_merge_spikes_radius<G>(&mut self, ρ : F, interp : bool, accept : G) -> usize |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
97 | where G : FnMut(&'_ Self) -> bool; |
0 | 98 | } |
99 | ||
100 | #[replace_float_literals(F::cast_from(literal))] | |
101 | impl<F : Float, const N : usize> DiscreteMeasure<Loc<F, N>, F> { | |
102 | /// Attempts to merge spikes with indices `i` and `j`. | |
103 | /// | |
104 | /// This assumes that the weights of the two spikes have already been checked not to be zero. | |
105 | /// | |
106 | /// The parameter `res` points to the current “result” for [`SpikeMerging::merge_spikes`]. | |
107 | /// If the merge is accepted by `accept` returning a [`Some`], `res` will be replaced by its | |
108 | /// return value. | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
109 | /// |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
110 | /// Returns the index of `self.spikes` storing the new spike. |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
111 | fn attempt_merge<G>( |
0 | 112 | &mut self, |
113 | i : usize, | |
114 | j : usize, | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
115 | interp : bool, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
116 | accept : &mut G |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
117 | ) -> Option<usize> |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
118 | where G : FnMut(&'_ Self) -> bool { |
0 | 119 | let &DeltaMeasure{ x : xi, α : αi } = &self.spikes[i]; |
120 | let &DeltaMeasure{ x : xj, α : αj } = &self.spikes[j]; | |
121 | ||
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
122 | if interp { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
123 | // Merge inplace |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
124 | self.spikes[i].α = 0.0; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
125 | self.spikes[j].α = 0.0; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
126 | let αia = αi.abs(); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
127 | let αja = αj.abs(); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
128 | self.spikes.push(DeltaMeasure{ α : αi + αj, x : (xi * αia + xj * αja) / (αia + αja) }); |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
129 | if accept(self) { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
130 | Some(self.spikes.len()-1) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
131 | } else { |
0 | 132 | // Merge not accepted, restore modification |
133 | self.spikes[i].α = αi; | |
134 | self.spikes[j].α = αj; | |
135 | self.spikes.pop(); | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
136 | None |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
137 | } |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
138 | } else { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
139 | // Attempt merge inplace, first combination |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
140 | self.spikes[i].α = αi + αj; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
141 | self.spikes[j].α = 0.0; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
142 | if accept(self) { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
143 | // Merge accepted |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
144 | Some(i) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
145 | } else { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
146 | // Attempt merge inplace, second combination |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
147 | self.spikes[i].α = 0.0; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
148 | self.spikes[j].α = αi + αj; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
149 | if accept(self) { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
150 | // Merge accepted |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
151 | Some(j) |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
152 | } else { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
153 | // Merge not accepted, restore modification |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
154 | self.spikes[i].α = αi; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
155 | self.spikes[j].α = αj; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
156 | None |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
157 | } |
0 | 158 | } |
159 | } | |
160 | } | |
161 | } | |
162 | ||
163 | /// Sorts a vector of indices into `slice` by `compare`. | |
164 | /// | |
165 | /// The closure `compare` operators on references to elements of `slice`. | |
166 | /// Returns the sorted vector of indices into `slice`. | |
167 | pub fn sort_indices_by<V, F>(slice : &[V], mut compare : F) -> Vec<usize> | |
168 | where F : FnMut(&V, &V) -> Ordering | |
169 | { | |
170 | let mut indices = Vec::from_iter(0..slice.len()); | |
171 | indices.sort_by(|&i, &j| compare(&slice[i], &slice[j])); | |
172 | indices | |
173 | } | |
174 | ||
175 | #[replace_float_literals(F::cast_from(literal))] | |
176 | impl<F : Float> SpikeMerging<F> for DiscreteMeasure<Loc<F, 1>, F> { | |
177 | ||
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
178 | fn do_merge_spikes_radius<G>( |
0 | 179 | &mut self, |
180 | ρ : F, | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
181 | interp : bool, |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
182 | mut accept : G |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
183 | ) -> usize |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
184 | where G : FnMut(&'_ Self) -> bool { |
0 | 185 | // Sort by coordinate into an indexing array. |
186 | let mut indices = sort_indices_by(&self.spikes, |&δ1, &δ2| { | |
187 | let &Loc([x1]) = &δ1.x; | |
188 | let &Loc([x2]) = &δ2.x; | |
189 | // nan-ignoring ordering of floats | |
190 | NaNLeast(x1).cmp(&NaNLeast(x2)) | |
191 | }); | |
192 | ||
193 | // Initialise result | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
194 | let mut count = 0; |
0 | 195 | |
196 | // Scan consecutive pairs and merge if close enough and accepted by `accept`. | |
197 | if indices.len() == 0 { | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
198 | return count |
0 | 199 | } |
200 | for k in 0..(indices.len()-1) { | |
201 | let i = indices[k]; | |
202 | let j = indices[k+1]; | |
203 | let &DeltaMeasure{ x : Loc([xi]), α : αi } = &self.spikes[i]; | |
204 | let &DeltaMeasure{ x : Loc([xj]), α : αj } = &self.spikes[j]; | |
205 | debug_assert!(xi <= xj); | |
206 | // If close enough, attempt merging | |
207 | if αi != 0.0 && αj != 0.0 && xj <= xi + ρ { | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
208 | if let Some(l) = self.attempt_merge(i, j, interp, &mut accept) { |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
209 | // For this to work (the debug_assert! to not trigger above), the new |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
210 | // coordinate produced by attempt_merge has to be at most xj. |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
211 | indices[k+1] = l; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
212 | count += 1 |
0 | 213 | } |
214 | } | |
215 | } | |
216 | ||
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
217 | count |
0 | 218 | } |
219 | } | |
220 | ||
221 | /// Orders `δ1` and `δ1` according to the first coordinate. | |
222 | fn compare_first_coordinate<F : Float>( | |
223 | δ1 : &DeltaMeasure<Loc<F, 2>, F>, | |
224 | δ2 : &DeltaMeasure<Loc<F, 2>, F> | |
225 | ) -> Ordering { | |
226 | let &Loc([x11, ..]) = &δ1.x; | |
227 | let &Loc([x21, ..]) = &δ2.x; | |
228 | // nan-ignoring ordering of floats | |
229 | NaNLeast(x11).cmp(&NaNLeast(x21)) | |
230 | } | |
231 | ||
232 | #[replace_float_literals(F::cast_from(literal))] | |
233 | impl<F : Float> SpikeMerging<F> for DiscreteMeasure<Loc<F, 2>, F> { | |
234 | ||
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
235 | fn do_merge_spikes_radius<G>(&mut self, ρ : F, interp : bool, mut accept : G) -> usize |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
236 | where G : FnMut(&'_ Self) -> bool { |
0 | 237 | // Sort by first coordinate into an indexing array. |
238 | let mut indices = sort_indices_by(&self.spikes, compare_first_coordinate); | |
239 | ||
240 | // Initialise result | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
241 | let mut count = 0; |
0 | 242 | let mut start_scan_2nd = 0; |
243 | ||
244 | // Scan in order | |
245 | if indices.len() == 0 { | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
246 | return count |
0 | 247 | } |
248 | for k in 0..indices.len()-1 { | |
249 | let i = indices[k]; | |
250 | let &DeltaMeasure{ x : Loc([xi1, xi2]), α : αi } = &self[i]; | |
251 | ||
252 | if αi == 0.0 { | |
253 | // Nothin to be done if the weight is already zero | |
254 | continue | |
255 | } | |
256 | ||
257 | let mut closest = None; | |
258 | ||
259 | // Scan for second spike. We start from `start_scan_2nd + 1` with `start_scan_2nd` | |
260 | // the smallest invalid merging index on the previous loop iteration, because a | |
261 | // the _closest_ mergeable spike might have index less than `k` in `indices`, and a | |
262 | // merge with it might have not been attempted with this spike if a different closer | |
263 | // spike was discovered based on the second coordinate. | |
264 | 'scan_2nd: for l in (start_scan_2nd+1)..indices.len() { | |
265 | if l == k { | |
266 | // Do not attempt to merge a spike with itself | |
267 | continue | |
268 | } | |
269 | let j = indices[l]; | |
270 | let &DeltaMeasure{ x : Loc([xj1, xj2]), α : αj } = &self[j]; | |
271 | ||
272 | if xj1 < xi1 - ρ { | |
273 | // Spike `j = indices[l]` has too low first coordinate. Update starting index | |
274 | // for next iteration, and continue scanning. | |
275 | start_scan_2nd = l; | |
276 | continue 'scan_2nd | |
277 | } else if xj1 > xi1 + ρ { | |
278 | // Break out: spike `j = indices[l]` has already too high first coordinate, no | |
279 | // more close enough spikes can be found due to the sorting of `indices`. | |
280 | break 'scan_2nd | |
281 | } | |
282 | ||
283 | // If also second coordinate is close enough, attempt merging if closer than | |
284 | // previously discovered mergeable spikes. | |
285 | let d2 = (xi2-xj2).abs(); | |
286 | if αj != 0.0 && d2 <= ρ { | |
287 | let r1 = xi1-xj1; | |
288 | let d = (d2*d2 + r1*r1).sqrt(); | |
289 | match closest { | |
290 | None => closest = Some((l, j, d)), | |
291 | Some((_, _, r)) if r > d => closest = Some((l, j, d)), | |
292 | _ => {}, | |
293 | } | |
294 | } | |
295 | } | |
296 | ||
297 | // Attempt merging closest close-enough spike | |
298 | if let Some((l, j, _)) = closest { | |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
299 | if let Some(n) = self.attempt_merge(i, j, interp, &mut accept) { |
0 | 300 | // If merge was succesfull, make new spike candidate for merging. |
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
301 | indices[l] = n; |
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
302 | count += 1; |
0 | 303 | let compare = |i, j| compare_first_coordinate(&self.spikes[i], |
304 | &self.spikes[j]); | |
305 | // Re-sort relevant range of indices | |
306 | if l < k { | |
307 | indices[l..k].sort_by(|&i, &j| compare(i, j)); | |
308 | } else { | |
309 | indices[k+1..=l].sort_by(|&i, &j| compare(i, j)); | |
310 | } | |
311 | } | |
312 | } | |
313 | } | |
314 | ||
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
315 | count |
0 | 316 | } |
317 | } | |
318 |