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