Tue, 06 Dec 2022 08:32:57 +0200
Fix broken links in doc comments after Mapping -> Apply change.
| 0 | 1 | |
| 2 | use numeric_literals::replace_float_literals; | |
| 3 | use std::iter::Sum; | |
| 4 | use std::marker::PhantomData; | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
5 | use std::sync::Arc; | 
| 0 | 6 | use crate::types::Float; | 
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
7 | use crate::mapping::{Apply, Mapping}; | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
8 | //use crate::linops::{Apply, Linear}; | 
| 0 | 9 | use crate::sets::Set; | 
| 5 | 10 | use crate::sets::Cube; | 
| 11 | use crate::loc::Loc; | |
| 0 | 12 | use super::support::*; | 
| 13 | use super::bt::*; | |
| 14 | use super::refine::*; | |
| 15 | use super::aggregator::*; | |
| 16 | use super::either::*; | |
| 17 | use crate::fe_model::base::RealLocalModel; | |
| 18 | use crate::fe_model::p2_local_model::*; | |
| 19 | ||
| 5 | 20 | /// Presentation for (mathematical) functions constructed as a sum of components functions with | 
| 21 | /// typically small support. | |
| 22 | /// | |
| 23 | /// The domain of the function is [`Loc`]`<F, N>`, where `F` is the type of floating point numbers, | |
| 24 | /// and `N` the dimension. | |
| 25 | /// | |
| 26 | /// The `generator` lists the component functions that have to implement [`Support`]. | |
| 27 | /// Identifiers of the components ([`SupportGenerator::Id`], usually `usize`) are stored stored | |
| 28 | /// in a [bisection tree][BTImpl], when one is provided as `bt`. However `bt` may also be `()` | |
| 29 | /// for a [`PreBTFN`] that is only useful for vector space operations with a full [`BTFN`]. | |
| 0 | 30 | #[derive(Clone,Debug)] | 
| 31 | pub struct BTFN< | |
| 32 | F : Float, | |
| 33 | G : SupportGenerator<F, N>, | |
| 34 | BT /*: BTImpl<F, N>*/, | |
| 35 | const N : usize | |
| 36 | > /*where G::SupportType : LocalAnalysis<F, A, N>*/ { | |
| 37 | bt : BT, | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
38 | generator : Arc<G>, | 
| 0 | 39 | _phantoms : PhantomData<F>, | 
| 40 | } | |
| 41 | ||
| 42 | impl<F : Float, G, BT, const N : usize> | |
| 43 | BTFN<F, G, BT, N> | |
| 44 | where G : SupportGenerator<F, N, Id=BT::Data>, | |
| 45 | G::SupportType : LocalAnalysis<F, BT::Agg, N>, | |
| 46 | BT : BTImpl<F, N> { | |
| 47 | ||
| 5 | 48 | /// Create a new BTFN from a support generator and a pre-initialised bisection tree. | 
| 49 | /// | |
| 50 | /// The bisection tree `bt` should be pre-initialised to correspond to the `generator`. | |
| 51 | /// Use [`Self::construct`] if no preinitialised tree is available. Use [`Self::new_refresh`] | |
| 52 | /// when the aggregators of the tree may need updates. | |
| 53 | /// | |
| 54 | /// See the documentation for [`BTFN`] on the role of the `generator`. | |
| 0 | 55 | pub fn new(bt : BT, generator : G) -> Self { | 
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
56 | Self::new_arc(bt, Arc::new(generator)) | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
57 | } | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
58 | |
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
59 | fn new_arc(bt : BT, generator : Arc<G>) -> Self { | 
| 0 | 60 | BTFN { | 
| 61 | bt : bt, | |
| 62 | generator : generator, | |
| 63 | _phantoms : std::marker::PhantomData, | |
| 64 | } | |
| 65 | } | |
| 66 | ||
| 5 | 67 | /// Create a new BTFN support generator and a pre-initialised bisection tree, | 
| 68 | /// cloning the tree and refreshing aggregators. | |
| 69 | /// | |
| 70 | /// The bisection tree `bt` should be pre-initialised to correspond to the `generator`, but | |
| 71 | /// the aggregator may be out of date. | |
| 72 | /// | |
| 73 | /// See the documentation for [`BTFN`] on the role of the `generator`. | |
| 0 | 74 | pub fn new_refresh(bt : &BT, generator : G) -> Self { | 
| 75 | // clone().refresh_aggregator(…) as opposed to convert_aggregator | |
| 76 | // ensures that type is maintained. Due to Rc-pointer copy-on-write, | |
| 77 | // the effort is not significantly different. | |
| 78 | let mut btnew = bt.clone(); | |
| 79 | btnew.refresh_aggregator(&generator); | |
| 80 | BTFN::new(btnew, generator) | |
| 81 | } | |
| 82 | ||
| 5 | 83 | /// Create a new BTFN from a support generator, domain, and depth for a new [`BT`]. | 
| 84 | /// | |
| 85 | /// The top node of the created [`BT`] will have the given `domain`. | |
| 86 | /// | |
| 87 | /// See the documentation for [`BTFN`] on the role of the `generator`. | |
| 0 | 88 | pub fn construct(domain : Cube<F, N>, depth : BT::Depth, generator : G) -> Self { | 
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
89 | Self::construct_arc(domain, depth, Arc::new(generator)) | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
90 | } | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
91 | |
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
92 | fn construct_arc(domain : Cube<F, N>, depth : BT::Depth, generator : Arc<G>) -> Self { | 
| 0 | 93 | let mut bt = BT::new(domain, depth); | 
| 94 | for (d, support) in generator.all_data() { | |
| 95 | bt.insert(d, &support); | |
| 96 | } | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
97 | Self::new_arc(bt, generator) | 
| 0 | 98 | } | 
| 99 | ||
| 5 | 100 | /// Convert the aggregator of the [`BTFN`] to a different one. | 
| 101 | /// | |
| 102 | /// This will construct a [`BTFN`] with the same components and generator as the (consumed) | |
| 103 | /// `self`, but a new `BT` with [`Aggregator`]s of type `ANew`. | |
| 0 | 104 | pub fn convert_aggregator<ANew>(self) -> BTFN<F, G, BT::Converted<ANew>, N> | 
| 105 | where ANew : Aggregator, | |
| 106 | G : SupportGenerator<F, N, Id=BT::Data>, | |
| 107 | G::SupportType : LocalAnalysis<F, ANew, N> { | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
108 | BTFN::new_arc(self.bt.convert_aggregator(&*self.generator), self.generator) | 
| 0 | 109 | } | 
| 110 | ||
| 111 | /// Change the generator (after, e.g., a scaling of the latter). | |
| 5 | 112 | fn new_generator(&self, generator : G) -> Self { | 
| 0 | 113 | BTFN::new_refresh(&self.bt, generator) | 
| 114 | } | |
| 115 | ||
| 116 | /// Refresh aggregator after updates to generator | |
| 117 | fn refresh_aggregator(&mut self) { | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
118 | self.bt.refresh_aggregator(&*self.generator); | 
| 0 | 119 | } | 
| 120 | ||
| 121 | } | |
| 122 | ||
| 5 | 123 | impl<F : Float, G, BT, const N : usize> | 
| 124 | BTFN<F, G, BT, N> | |
| 125 | where G : SupportGenerator<F, N> { | |
| 126 | /// Change the [bisection tree][BTImpl] of the [`BTFN`] to a different one. | |
| 127 | /// | |
| 128 | /// This can be used to convert a [`PreBTFN`] to a full [`BTFN`], or the change | |
| 129 | /// the aggreagator; see also [`self.convert_aggregator`]. | |
| 130 | pub fn instantiate< | |
| 131 | BTNew : BTImpl<F, N, Data=G::Id>, | |
| 132 | > (self, domain : Cube<F, N>, depth : BTNew::Depth) -> BTFN<F, G, BTNew, N> | |
| 133 | where G::SupportType : LocalAnalysis<F, BTNew::Agg, N> { | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
134 | BTFN::construct_arc(domain, depth, self.generator) | 
| 5 | 135 | } | 
| 136 | } | |
| 137 | ||
| 138 | /// A BTFN with no bisection tree. | |
| 139 | /// | |
| 140 | /// Most BTFN methods are not available, but if a BTFN is going to be summed with another | |
| 141 | /// before other use, it will be more efficient to not construct an unnecessary bisection tree | |
| 142 | /// that would be shortly dropped. | |
| 0 | 143 | pub type PreBTFN<F, G, const N : usize> = BTFN<F, G, (), N>; | 
| 144 | ||
| 145 | impl<F : Float, G, const N : usize> PreBTFN<F, G, N> where G : SupportGenerator<F, N> { | |
| 146 | ||
| 5 | 147 | /// Create a new [`PreBTFN`] with no bisection tree. | 
| 0 | 148 | pub fn new_pre(generator : G) -> Self { | 
| 149 | BTFN { | |
| 150 | bt : (), | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
151 | generator : Arc::new(generator), | 
| 0 | 152 | _phantoms : std::marker::PhantomData, | 
| 153 | } | |
| 154 | } | |
| 155 | } | |
| 156 | ||
| 157 | impl<F : Float, G, BT, const N : usize> | |
| 158 | BTFN<F, G, BT, N> | |
| 159 | where G : SupportGenerator<F, N, Id=usize>, | |
| 160 | G::SupportType : LocalAnalysis<F, BT::Agg, N>, | |
| 161 | BT : BTImpl<F, N, Data=usize> { | |
| 162 | ||
| 163 | /// Helper function for implementing [`std::ops::Add`]. | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
164 | fn add_another<G2>(&self, g2 : Arc<G2>) -> BTFN<F, BothGenerators<G, G2>, BT, N> | 
| 0 | 165 | where G2 : SupportGenerator<F, N, Id=usize>, | 
| 166 | G2::SupportType : LocalAnalysis<F, BT::Agg, N> { | |
| 167 | ||
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
168 | let mut bt = self.bt.clone(); | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
169 | let both = BothGenerators(Arc::clone(&self.generator), g2); | 
| 0 | 170 | |
| 171 | for (d, support) in both.all_right_data() { | |
| 172 | bt.insert(d, &support); | |
| 173 | } | |
| 174 | ||
| 175 | BTFN { | |
| 176 | bt : bt, | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
177 | generator : Arc::new(both), | 
| 0 | 178 | _phantoms : std::marker::PhantomData, | 
| 179 | } | |
| 180 | } | |
| 181 | } | |
| 182 | ||
| 183 | macro_rules! make_btfn_add { | |
| 184 | ($lhs:ty, $preprocess:path, $($extra_trait:ident)?) => { | |
| 185 | impl<'a, F : Float, G1, G2, BT1, BT2, const N : usize> | |
| 186 | std::ops::Add<BTFN<F, G2, BT2, N>> for | |
| 187 | $lhs | |
| 188 | where BT1 : BTImpl<F, N, Data=usize>, | |
| 189 | G1 : SupportGenerator<F, N, Id=usize> + $($extra_trait)?, | |
| 190 | G2 : SupportGenerator<F, N, Id=usize>, | |
| 191 | G1::SupportType : LocalAnalysis<F, BT1::Agg, N>, | |
| 192 | G2::SupportType : LocalAnalysis<F, BT1::Agg, N> { | |
| 193 | type Output = BTFN<F, BothGenerators<G1, G2>, BT1, N>; | |
| 194 | #[inline] | |
| 195 | fn add(self, other : BTFN<F, G2, BT2, N>) -> Self::Output { | |
| 196 | $preprocess(self).add_another(other.generator) | |
| 197 | } | |
| 198 | } | |
| 199 | ||
| 200 | impl<'a, 'b, F : Float, G1, G2, BT1, BT2, const N : usize> | |
| 201 | std::ops::Add<&'b BTFN<F, G2, BT2, N>> for | |
| 202 | $lhs | |
| 203 | where BT1 : BTImpl<F, N, Data=usize>, | |
| 204 | G1 : SupportGenerator<F, N, Id=usize> + $($extra_trait)?, | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
205 | G2 : SupportGenerator<F, N, Id=usize>, | 
| 0 | 206 | G1::SupportType : LocalAnalysis<F, BT1::Agg, N>, | 
| 207 | G2::SupportType : LocalAnalysis<F, BT1::Agg, N> { | |
| 208 | ||
| 209 | type Output = BTFN<F, BothGenerators<G1, G2>, BT1, N>; | |
| 210 | #[inline] | |
| 211 | fn add(self, other : &'b BTFN<F, G2, BT2, N>) -> Self::Output { | |
| 212 | $preprocess(self).add_another(other.generator.clone()) | |
| 213 | } | |
| 214 | } | |
| 215 | } | |
| 216 | } | |
| 217 | ||
| 218 | make_btfn_add!(BTFN<F, G1, BT1, N>, std::convert::identity, ); | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
219 | make_btfn_add!(&'a BTFN<F, G1, BT1, N>, Clone::clone, ); | 
| 0 | 220 | |
| 221 | macro_rules! make_btfn_sub { | |
| 222 | ($lhs:ty, $preprocess:path, $($extra_trait:ident)?) => { | |
| 223 | impl<'a, F : Float, G1, G2, BT1, BT2, const N : usize> | |
| 224 | std::ops::Sub<BTFN<F, G2, BT2, N>> for | |
| 225 | $lhs | |
| 226 | where BT1 : BTImpl<F, N, Data=usize>, | |
| 227 | G1 : SupportGenerator<F, N, Id=usize> + $($extra_trait)?, | |
| 228 | G2 : SupportGenerator<F, N, Id=usize>, | |
| 229 | G1::SupportType : LocalAnalysis<F, BT1::Agg, N>, | |
| 230 | G2::SupportType : LocalAnalysis<F, BT1::Agg, N> { | |
| 231 | type Output = BTFN<F, BothGenerators<G1, G2>, BT1, N>; | |
| 232 | #[inline] | |
| 233 | fn sub(self, other : BTFN<F, G2, BT2, N>) -> Self::Output { | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
234 | $preprocess(self).add_another(Arc::new( | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
235 | Arc::try_unwrap(other.generator) | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
236 | .unwrap_or_else(|arc| (*arc).clone()) | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
237 | .neg() | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
238 | )) | 
| 0 | 239 | } | 
| 240 | } | |
| 241 | ||
| 242 | impl<'a, 'b, F : Float, G1, G2, BT1, BT2, const N : usize> | |
| 243 | std::ops::Sub<&'b BTFN<F, G2, BT2, N>> for | |
| 244 | $lhs | |
| 245 | where BT1 : BTImpl<F, N, Data=usize>, | |
| 246 | G1 : SupportGenerator<F, N, Id=usize> + $($extra_trait)?, | |
| 247 | G2 : SupportGenerator<F, N, Id=usize> + Clone, | |
| 248 | G1::SupportType : LocalAnalysis<F, BT1::Agg, N>, | |
| 249 | G2::SupportType : LocalAnalysis<F, BT1::Agg, N>, | |
| 5 | 250 | &'b G2 : std::ops::Neg<Output=G2> { | 
| 0 | 251 | |
| 252 | type Output = BTFN<F, BothGenerators<G1, G2>, BT1, N>; | |
| 253 | #[inline] | |
| 254 | fn sub(self, other : &'b BTFN<F, G2, BT2, N>) -> Self::Output { | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
255 | $preprocess(self).add_another(Arc::new((*other.generator).clone().neg())) | 
| 0 | 256 | } | 
| 257 | } | |
| 258 | } | |
| 259 | } | |
| 260 | ||
| 261 | make_btfn_sub!(BTFN<F, G1, BT1, N>, std::convert::identity, ); | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
262 | make_btfn_sub!(&'a BTFN<F, G1, BT1, N>, std::convert::identity, ); | 
| 0 | 263 | |
| 264 | macro_rules! make_btfn_scalarop_rhs { | |
| 265 | ($trait:ident, $fn:ident, $trait_assign:ident, $fn_assign:ident) => { | |
| 266 | impl<F : Float, G, BT, const N : usize> | |
| 267 | std::ops::$trait_assign<F> | |
| 268 | for BTFN<F, G, BT, N> | |
| 269 | where BT : BTImpl<F, N>, | |
| 270 | G : SupportGenerator<F, N, Id=BT::Data>, | |
| 271 | G::SupportType : LocalAnalysis<F, BT::Agg, N> { | |
| 272 | #[inline] | |
| 273 | fn $fn_assign(&mut self, t : F) { | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
274 | Arc::make_mut(&mut self.generator).$fn_assign(t); | 
| 0 | 275 | self.refresh_aggregator(); | 
| 276 | } | |
| 277 | } | |
| 278 | ||
| 279 | impl<F : Float, G, BT, const N : usize> | |
| 280 | std::ops::$trait<F> | |
| 281 | for BTFN<F, G, BT, N> | |
| 282 | where BT : BTImpl<F, N>, | |
| 283 | G : SupportGenerator<F, N, Id=BT::Data>, | |
| 284 | G::SupportType : LocalAnalysis<F, BT::Agg, N> { | |
| 285 | type Output = Self; | |
| 286 | #[inline] | |
| 287 | fn $fn(mut self, t : F) -> Self::Output { | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
288 | Arc::make_mut(&mut self.generator).$fn_assign(t); | 
| 0 | 289 | self.refresh_aggregator(); | 
| 290 | self | |
| 291 | } | |
| 292 | } | |
| 293 | ||
| 294 | impl<'a, F : Float, G, BT, const N : usize> | |
| 295 | std::ops::$trait<F> | |
| 296 | for &'a BTFN<F, G, BT, N> | |
| 297 | where BT : BTImpl<F, N>, | |
| 298 | G : SupportGenerator<F, N, Id=BT::Data>, | |
| 299 | G::SupportType : LocalAnalysis<F, BT::Agg, N>, | |
| 300 | &'a G : std::ops::$trait<F,Output=G> { | |
| 301 | type Output = BTFN<F, G, BT, N>; | |
| 302 | #[inline] | |
| 303 | fn $fn(self, t : F) -> Self::Output { | |
| 304 | self.new_generator(self.generator.$fn(t)) | |
| 305 | } | |
| 306 | } | |
| 307 | } | |
| 308 | } | |
| 309 | ||
| 310 | make_btfn_scalarop_rhs!(Mul, mul, MulAssign, mul_assign); | |
| 311 | make_btfn_scalarop_rhs!(Div, div, DivAssign, div_assign); | |
| 312 | ||
| 313 | macro_rules! make_btfn_scalarop_lhs { | |
| 314 | ($trait:ident, $fn:ident, $fn_assign:ident, $($f:ident)+) => { $( | |
| 315 | impl<G, BT, const N : usize> | |
| 316 | std::ops::$trait<BTFN<$f, G, BT, N>> | |
| 317 | for $f | |
| 318 | where BT : BTImpl<$f, N>, | |
| 319 | G : SupportGenerator<$f, N, Id=BT::Data>, | |
| 320 | G::SupportType : LocalAnalysis<$f, BT::Agg, N> { | |
| 321 | type Output = BTFN<$f, G, BT, N>; | |
| 322 | #[inline] | |
| 323 | fn $fn(self, mut a : BTFN<$f, G, BT, N>) -> Self::Output { | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
324 | Arc::make_mut(&mut a.generator).$fn_assign(self); | 
| 0 | 325 | a.refresh_aggregator(); | 
| 326 | a | |
| 327 | } | |
| 328 | } | |
| 329 | ||
| 330 | impl<'a, G, BT, const N : usize> | |
| 331 | std::ops::$trait<&'a BTFN<$f, G, BT, N>> | |
| 332 | for $f | |
| 333 | where BT : BTImpl<$f, N>, | |
| 334 | G : SupportGenerator<$f, N, Id=BT::Data> + Clone, | |
| 335 | G::SupportType : LocalAnalysis<$f, BT::Agg, N>, | |
| 336 | // FIXME: This causes compiler overflow | |
| 337 | /*&'a G : std::ops::$trait<$f,Output=G>*/ { | |
| 338 | type Output = BTFN<$f, G, BT, N>; | |
| 339 | #[inline] | |
| 340 | fn $fn(self, a : &'a BTFN<$f, G, BT, N>) -> Self::Output { | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
341 | let mut tmp = (*a.generator).clone(); | 
| 0 | 342 | tmp.$fn_assign(self); | 
| 343 | a.new_generator(tmp) | |
| 344 | // FIXME: Prevented by the compiler overflow above. | |
| 345 | //a.new_generator(a.generator.$fn(a)) | |
| 346 | } | |
| 347 | } | |
| 348 | )+ } | |
| 349 | } | |
| 350 | ||
| 351 | make_btfn_scalarop_lhs!(Mul, mul, mul_assign, f32 f64); | |
| 352 | make_btfn_scalarop_lhs!(Div, div, div_assign, f32 f64); | |
| 353 | ||
| 354 | macro_rules! make_btfn_unaryop { | |
| 355 | ($trait:ident, $fn:ident) => { | |
| 356 | impl<F : Float, G, BT, const N : usize> | |
| 357 | std::ops::$trait | |
| 358 | for BTFN<F, G, BT, N> | |
| 359 | where BT : BTImpl<F, N>, | |
| 360 | G : SupportGenerator<F, N, Id=BT::Data>, | |
| 361 | G::SupportType : LocalAnalysis<F, BT::Agg, N> { | |
| 362 | type Output = Self; | |
| 363 | #[inline] | |
| 364 | fn $fn(mut self) -> Self::Output { | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
365 | self.generator = Arc::new(Arc::unwrap_or_clone(self.generator).$fn()); | 
| 0 | 366 | self.refresh_aggregator(); | 
| 367 | self | |
| 368 | } | |
| 369 | } | |
| 370 | ||
| 371 | /*impl<'a, F : Float, G, BT, const N : usize> | |
| 372 | std::ops::$trait | |
| 373 | for &'a BTFN<F, G, BT, N> | |
| 374 | where BT : BTImpl<F, N>, | |
| 375 | G : SupportGenerator<F, N, Id=BT::Data>, | |
| 376 | G::SupportType : LocalAnalysis<F, BT::Agg, N>, | |
| 377 | &'a G : std::ops::$trait<Output=G> { | |
| 378 | type Output = BTFN<F, G, BT, N>; | |
| 379 | #[inline] | |
| 380 | fn $fn(self) -> Self::Output { | |
| 381 | self.new_generator(std::ops::$trait::$fn(&self.generator)) | |
| 382 | } | |
| 383 | }*/ | |
| 384 | } | |
| 385 | } | |
| 386 | ||
| 387 | make_btfn_unaryop!(Neg, neg); | |
| 388 | ||
| 389 | ||
| 390 | ||
| 391 | // | |
| 392 | // Mapping | |
| 393 | // | |
| 394 | ||
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
395 | impl<'a, F : Float, G, BT, V, const N : usize> Apply<&'a Loc<F, N>> | 
| 0 | 396 | for BTFN<F, G, BT, N> | 
| 397 | where BT : BTImpl<F, N>, | |
| 398 | G : SupportGenerator<F, N, Id=BT::Data>, | |
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
399 | G::SupportType : LocalAnalysis<F, BT::Agg, N> + Apply<&'a Loc<F, N>, Output = V>, | 
| 0 | 400 | V : Sum { | 
| 401 | ||
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
402 | type Output = V; | 
| 0 | 403 | |
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
404 | fn apply(&self, x : &'a Loc<F, N>) -> Self::Output { | 
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
405 | self.bt.iter_at(x) | 
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
406 | .map(|&d| self.generator.support_for(d).apply(x)).sum() | 
| 0 | 407 | } | 
| 408 | } | |
| 409 | ||
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
410 | impl<F : Float, G, BT, V, const N : usize> Apply<Loc<F, N>> | 
| 0 | 411 | for BTFN<F, G, BT, N> | 
| 412 | where BT : BTImpl<F, N>, | |
| 413 | G : SupportGenerator<F, N, Id=BT::Data>, | |
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
414 | G::SupportType : LocalAnalysis<F, BT::Agg, N> + Apply<Loc<F, N>, Output = V>, | 
| 0 | 415 | V : Sum { | 
| 416 | ||
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
417 | type Output = V; | 
| 0 | 418 | |
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
419 | fn apply(&self, x : Loc<F, N>) -> Self::Output { | 
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
420 | self.bt.iter_at(&x) | 
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
421 | .map(|&d| self.generator.support_for(d).apply(x)).sum() | 
| 0 | 422 | } | 
| 423 | } | |
| 424 | ||
| 425 | impl<F : Float, G, BT, const N : usize> GlobalAnalysis<F, BT::Agg> | |
| 426 | for BTFN<F, G, BT, N> | |
| 427 | where BT : BTImpl<F, N>, | |
| 428 | G : SupportGenerator<F, N, Id=BT::Data>, | |
| 429 | G::SupportType : LocalAnalysis<F, BT::Agg, N> { | |
| 430 | ||
| 431 | #[inline] | |
| 432 | fn global_analysis(&self) -> BT::Agg { | |
| 433 | self.bt.global_analysis() | |
| 434 | } | |
| 435 | } | |
| 436 | ||
| 437 | // | |
| 438 | // Blanket implementation of BTFN as a linear functional over objects | |
| 439 | // that are linear functionals over BTFN. | |
| 440 | // | |
| 441 | ||
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
442 | /* | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
443 | impl<'b, X, F : Float, G, BT, const N : usize> Apply<&'b X, F> | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
444 | for BTFN<F, G, BT, N> | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
445 | where BT : BTImpl<F, N>, | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
446 | G : SupportGenerator<F, N, Id=BT::Data>, | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
447 | G::SupportType : LocalAnalysis<F, BT::Agg, N>, | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
448 | X : for<'a> Apply<&'a BTFN<F, G, BT, N>, F> { | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
449 | |
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
450 | #[inline] | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
451 | fn apply(&self, x : &'b X) -> F { | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
452 | x.apply(&self) | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
453 | } | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
454 | } | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
455 | |
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
456 | impl<X, F : Float, G, BT, const N : usize> Apply<X, F> | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
457 | for BTFN<F, G, BT, N> | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
458 | where BT : BTImpl<F, N>, | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
459 | G : SupportGenerator<F, N, Id=BT::Data>, | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
460 | G::SupportType : LocalAnalysis<F, BT::Agg, N>, | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
461 | X : for<'a> Apply<&'a BTFN<F, G, BT, N>, F> { | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
462 | |
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
463 | #[inline] | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
464 | fn apply(&self, x : X) -> F { | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
465 | x.apply(&self) | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
466 | } | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
467 | } | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
468 | |
| 0 | 469 | impl<X, F : Float, G, BT, const N : usize> Linear<X> | 
| 470 | for BTFN<F, G, BT, N> | |
| 471 | where BT : BTImpl<F, N>, | |
| 472 | G : SupportGenerator<F, N, Id=BT::Data>, | |
| 473 | G::SupportType : LocalAnalysis<F, BT::Agg, N>, | |
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
474 | X : for<'a> Apply<&'a BTFN<F, G, BT, N>, F> { | 
| 0 | 475 | type Codomain = F; | 
| 476 | } | |
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
477 | */ | 
| 0 | 478 | |
| 479 | /// Helper trait for performing approximate minimisation using P2 elements. | |
| 5 | 480 | /// | 
| 481 | /// `U` is the domain, generally [`Loc`]`<F, N>`, and `F` the type of floating point numbers. | |
| 482 | /// `Self` is generally a set of `U`, for example, [`Cube`]`<F, N>`. | |
| 0 | 483 | pub trait P2Minimise<U, F : Float> : Set<U> { | 
| 5 | 484 | /// Minimise `g` over the set presented by `Self`. | 
| 485 | /// | |
| 486 | /// The function returns `(x, v)` where `x` is the minimiser `v` an approximation of `g(x)`. | |
| 0 | 487 | fn p2_minimise<G : Fn(&U) -> F>(&self, g : G) -> (U, F); | 
| 488 | ||
| 489 | } | |
| 490 | ||
| 491 | impl<F : Float> P2Minimise<Loc<F, 1>, F> for Cube<F, 1> { | |
| 492 | fn p2_minimise<G : Fn(&Loc<F, 1>) -> F>(&self, g : G) -> (Loc<F, 1>, F) { | |
| 493 | let interval = Simplex(self.corners()); | |
| 494 | interval.p2_model(&g).minimise(&interval) | |
| 495 | } | |
| 496 | } | |
| 497 | ||
| 498 | #[replace_float_literals(F::cast_from(literal))] | |
| 499 | impl<F : Float> P2Minimise<Loc<F, 2>, F> for Cube<F, 2> { | |
| 500 | fn p2_minimise<G : Fn(&Loc<F, 2>) -> F>(&self, g : G) -> (Loc<F, 2>, F) { | |
| 501 | if false { | |
| 502 | // Split into two triangle (simplex) with separate P2 model in each. | |
| 503 | // The six nodes of each triangle are the corners and the edges. | |
| 504 | let [a, b, c, d] = self.corners(); | |
| 505 | let [va, vb, vc, vd] = [g(&a), g(&b), g(&c), g(&d)]; | |
| 506 | ||
| 507 | let ab = midpoint(&a, &b); | |
| 508 | let bc = midpoint(&b, &c); | |
| 509 | let ca = midpoint(&c, &a); | |
| 510 | let cd = midpoint(&c, &d); | |
| 511 | let da = midpoint(&d, &a); | |
| 512 | let [vab, vbc, vca, vcd, vda] = [g(&ab), g(&bc), g(&ca), g(&cd), g(&da)]; | |
| 513 | ||
| 514 | let s1 = Simplex([a, b, c]); | |
| 5 | 515 | let m1 = P2LocalModel::<F, 2, 3>::new( | 
| 0 | 516 | &[a, b, c, ab, bc, ca], | 
| 517 | &[va, vb, vc, vab, vbc, vca] | |
| 518 | ); | |
| 519 | ||
| 520 | let r1@(_, v1) = m1.minimise(&s1); | |
| 521 | ||
| 522 | let s2 = Simplex([c, d, a]); | |
| 5 | 523 | let m2 = P2LocalModel::<F, 2, 3>::new( | 
| 0 | 524 | &[c, d, a, cd, da, ca], | 
| 525 | &[vc, vd, va, vcd, vda, vca] | |
| 526 | ); | |
| 527 | ||
| 528 | let r2@(_, v2) = m2.minimise(&s2); | |
| 529 | ||
| 530 | if v1 < v2 { r1 } else { r2 } | |
| 531 | } else { | |
| 532 | // Single P2 model for the entire cube. | |
| 533 | let [a, b, c, d] = self.corners(); | |
| 534 | let [va, vb, vc, vd] = [g(&a), g(&b), g(&c), g(&d)]; | |
| 535 | let [e, f] = match 'r' { | |
| 536 | 'm' => [(&a + &b + &c) / 3.0, (&c + &d + &a) / 3.0], | |
| 537 | 'c' => [midpoint(&a, &b), midpoint(&a, &d)], | |
| 538 | 'w' => [(&a + &b * 2.0) / 3.0, (&a + &d * 2.0) / 3.0], | |
| 539 | 'r' => { | |
| 540 | // Pseudo-randomise edge midpoints | |
| 541 | let Loc([x, y]) = a; | |
| 542 | let tmp : f64 = (x+y).as_(); | |
| 543 | match tmp.to_bits() % 4 { | |
| 544 | 0 => [midpoint(&a, &b), midpoint(&a, &d)], | |
| 545 | 1 => [midpoint(&c, &d), midpoint(&a, &d)], | |
| 546 | 2 => [midpoint(&a, &b), midpoint(&b, &c)], | |
| 547 | _ => [midpoint(&c, &d), midpoint(&b, &c)], | |
| 548 | } | |
| 549 | }, | |
| 550 | _ => [self.center(), (&a + &b) / 2.0], | |
| 551 | }; | |
| 552 | let [ve, vf] = [g(&e), g(&f)]; | |
| 553 | ||
| 5 | 554 | let m1 = P2LocalModel::<F, 2, 3>::new( | 
| 0 | 555 | &[a, b, c, d, e, f], | 
| 556 | &[va, vb, vc, vd, ve, vf], | |
| 557 | ); | |
| 558 | ||
| 559 | m1.minimise(self) | |
| 560 | } | |
| 561 | } | |
| 562 | } | |
| 563 | ||
| 5 | 564 | /// Helper type to use [`P2Refiner`] for maximisation. | 
| 0 | 565 | struct RefineMax; | 
| 5 | 566 | |
| 567 | /// Helper type to use [`P2Refiner`] for minimisation. | |
| 0 | 568 | struct RefineMin; | 
| 569 | ||
| 5 | 570 | /// A bisection tree [`Refiner`] for maximising or minimising a [`BTFN`]. | 
| 571 | /// | |
| 0 | 572 | /// The type parameter `T` should be either [`RefineMax`] or [`RefineMin`]. | 
| 573 | struct P2Refiner<F : Float, T> { | |
| 5 | 574 | /// The maximum / minimum should be above / below this threshold. | 
| 575 | /// If the threshold cannot be satisfied, the refiner will return `None`. | |
| 0 | 576 | bound : Option<F>, | 
| 5 | 577 | /// Tolerance for function value estimation. | 
| 0 | 578 | tolerance : F, | 
| 5 | 579 | /// Maximum number of steps to execute the refiner for | 
| 0 | 580 | max_steps : usize, | 
| 5 | 581 | /// Either [`RefineMax`] or [`RefineMin`]. Used only for type system purposes. | 
| 0 | 582 | #[allow(dead_code)] // `how` is just for type system purposes. | 
| 583 | how : T, | |
| 584 | } | |
| 585 | ||
| 586 | impl<F : Float, G, const N : usize> Refiner<F, Bounds<F>, G, N> | |
| 587 | for P2Refiner<F, RefineMax> | |
| 588 | where Cube<F, N> : P2Minimise<Loc<F, N>, F>, | |
| 589 | G : SupportGenerator<F, N>, | |
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
590 | G::SupportType : Mapping<Loc<F, N>, Codomain=F> | 
| 0 | 591 | + LocalAnalysis<F, Bounds<F>, N> { | 
| 592 | type Result = Option<(Loc<F, N>, F)>; | |
| 593 | type Sorting = UpperBoundSorting<F>; | |
| 594 | ||
| 595 | fn refine( | |
| 596 | &self, | |
| 597 | aggregator : &Bounds<F>, | |
| 598 | cube : &Cube<F, N>, | |
| 
9
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
599 | data : &[G::Id], | 
| 0 | 600 | generator : &G, | 
| 601 | step : usize | |
| 602 | ) -> RefinerResult<Bounds<F>, Self::Result> { | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
603 | |
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
604 | if self.bound.map_or(false, |b| aggregator.upper() <= b + self.tolerance) { | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
605 | // The upper bound is below the maximisation threshold. Don't bother with this cube. | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
606 | return RefinerResult::Uncertain(*aggregator, None) | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
607 | } | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
608 | |
| 0 | 609 | // g gives the negative of the value of the function presented by `data` and `generator`. | 
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
610 | let g = move |x : &Loc<F, N>| { | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
611 | let f = move |&d| generator.support_for(d).apply(x); | 
| 0 | 612 | -data.iter().map(f).sum::<F>() | 
| 613 | }; | |
| 614 | // … so the negative of the minimum is the maximm we want. | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
615 | let (x, _neg_v) = cube.p2_minimise(g); | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
616 | //let v = -neg_v; | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
617 | let v = -g(&x); | 
| 0 | 618 | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
619 | if step < self.max_steps && (aggregator.upper() > v + self.tolerance | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
620 | /*|| aggregator.lower() > v - self.tolerance*/) { | 
| 0 | 621 | // The function isn't refined enough in `cube`, so return None | 
| 622 | // to indicate that further subdivision is required. | |
| 623 | RefinerResult::NeedRefinement | |
| 624 | } else { | |
| 625 | // The data is refined enough, so return new hopefully better bounds | |
| 626 | // and the maximiser. | |
| 627 | let res = (x, v); | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
628 | let bounds = Bounds(v, v); | 
| 0 | 629 | RefinerResult::Uncertain(bounds, Some(res)) | 
| 630 | } | |
| 631 | } | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
632 | |
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
633 | fn fuse_results(r1 : &mut Self::Result, r2 : Self::Result) { | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
634 | match (*r1, r2) { | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
635 | (Some((_, v1)), Some((_, v2))) => if v1 < v2 { *r1 = r2 } | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
636 | (None, Some(_)) => *r1 = r2, | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
637 | (_, _) => {}, | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
638 | } | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
639 | } | 
| 0 | 640 | } | 
| 641 | ||
| 642 | ||
| 643 | impl<F : Float, G, const N : usize> Refiner<F, Bounds<F>, G, N> | |
| 644 | for P2Refiner<F, RefineMin> | |
| 645 | where Cube<F, N> : P2Minimise<Loc<F, N>, F>, | |
| 646 | G : SupportGenerator<F, N>, | |
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
647 | G::SupportType : Mapping<Loc<F, N>, Codomain=F> | 
| 0 | 648 | + LocalAnalysis<F, Bounds<F>, N> { | 
| 649 | type Result = Option<(Loc<F, N>, F)>; | |
| 650 | type Sorting = LowerBoundSorting<F>; | |
| 651 | ||
| 652 | fn refine( | |
| 653 | &self, | |
| 654 | aggregator : &Bounds<F>, | |
| 655 | cube : &Cube<F, N>, | |
| 
9
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
656 | data : &[G::Id], | 
| 0 | 657 | generator : &G, | 
| 658 | step : usize | |
| 659 | ) -> RefinerResult<Bounds<F>, Self::Result> { | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
660 | |
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
661 | if self.bound.map_or(false, |b| aggregator.lower() >= b - self.tolerance) { | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
662 | // The lower bound is above the minimisation threshold. Don't bother with this cube. | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
663 | return RefinerResult::Uncertain(*aggregator, None) | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
664 | } | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
665 | |
| 0 | 666 | // g gives the value of the function presented by `data` and `generator`. | 
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
667 | let g = move |x : &Loc<F, N>| { | 
| 
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
668 | let f = move |&d| generator.support_for(d).apply(x); | 
| 0 | 669 | data.iter().map(f).sum::<F>() | 
| 670 | }; | |
| 671 | // Minimise it. | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
672 | let (x, _v) = cube.p2_minimise(g); | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
673 | let v = g(&x); | 
| 0 | 674 | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
675 | if step < self.max_steps && (aggregator.lower() < v - self.tolerance | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
676 | /*|| aggregator.upper() < v + self.tolerance*/) { | 
| 0 | 677 | // The function isn't refined enough in `cube`, so return None | 
| 678 | // to indicate that further subdivision is required. | |
| 679 | RefinerResult::NeedRefinement | |
| 680 | } else { | |
| 681 | // The data is refined enough, so return new hopefully better bounds | |
| 682 | // and the minimiser. | |
| 683 | let res = (x, v); | |
| 
9
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
684 | let l = aggregator.lower(); | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
685 | let bounds = if l > v { | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
686 | eprintln!("imprecision!"); | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
687 | Bounds(l, l) | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
688 | } else { | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
689 | Bounds(v, v) | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
690 | }; | 
| 0 | 691 | RefinerResult::Uncertain(bounds, Some(res)) | 
| 692 | } | |
| 693 | } | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
694 | |
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
695 | fn fuse_results(r1 : &mut Self::Result, r2 : Self::Result) { | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
696 | match (*r1, r2) { | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
697 | (Some((_, v1)), Some((_, v2))) => if v1 > v2 { *r1 = r2 } | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
698 | (_, Some(_)) => *r1 = r2, | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
699 | (_, _) => {}, | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
700 | } | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
701 | } | 
| 0 | 702 | } | 
| 703 | ||
| 704 | ||
| 5 | 705 | /// A bisection tree [`Refiner`] for checking that a [`BTFN`] is within a stated | 
| 706 | //// upper or lower bound. | |
| 707 | /// | |
| 708 | /// The type parameter `T` should be either [`RefineMax`] for upper bound or [`RefineMin`] | |
| 709 | /// for lower bound. | |
| 0 | 710 | |
| 711 | struct BoundRefiner<F : Float, T> { | |
| 5 | 712 | /// The upper/lower bound to check for | 
| 0 | 713 | bound : F, | 
| 5 | 714 | /// Tolerance for function value estimation. | 
| 0 | 715 | tolerance : F, | 
| 5 | 716 | /// Maximum number of steps to execute the refiner for | 
| 0 | 717 | max_steps : usize, | 
| 718 | #[allow(dead_code)] // `how` is just for type system purposes. | |
| 5 | 719 | /// Either [`RefineMax`] or [`RefineMin`]. Used only for type system purposes. | 
| 0 | 720 | how : T, | 
| 721 | } | |
| 722 | ||
| 723 | impl<F : Float, G, const N : usize> Refiner<F, Bounds<F>, G, N> | |
| 724 | for BoundRefiner<F, RefineMax> | |
| 725 | where G : SupportGenerator<F, N> { | |
| 726 | type Result = bool; | |
| 727 | type Sorting = UpperBoundSorting<F>; | |
| 728 | ||
| 729 | fn refine( | |
| 730 | &self, | |
| 731 | aggregator : &Bounds<F>, | |
| 732 | _cube : &Cube<F, N>, | |
| 
9
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
733 | _data : &[G::Id], | 
| 0 | 734 | _generator : &G, | 
| 735 | step : usize | |
| 736 | ) -> RefinerResult<Bounds<F>, Self::Result> { | |
| 737 | if aggregator.upper() <= self.bound + self.tolerance { | |
| 738 | // Below upper bound within tolerances. Indicate uncertain success. | |
| 739 | RefinerResult::Uncertain(*aggregator, true) | |
| 740 | } else if aggregator.lower() >= self.bound - self.tolerance { | |
| 741 | // Above upper bound within tolerances. Indicate certain failure. | |
| 742 | RefinerResult::Certain(false) | |
| 743 | } else if step < self.max_steps { | |
| 744 | // No decision possible, but within step bounds - further subdivision is required. | |
| 745 | RefinerResult::NeedRefinement | |
| 746 | } else { | |
| 747 | // No decision possible, but past step bounds | |
| 748 | RefinerResult::Uncertain(*aggregator, false) | |
| 749 | } | |
| 750 | } | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
751 | |
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
752 | fn fuse_results(r1 : &mut Self::Result, r2 : Self::Result) { | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
753 | *r1 = *r1 && r2; | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
754 | } | 
| 0 | 755 | } | 
| 756 | ||
| 5 | 757 | impl<F : Float, G, const N : usize> Refiner<F, Bounds<F>, G, N> | 
| 758 | for BoundRefiner<F, RefineMin> | |
| 759 | where G : SupportGenerator<F, N> { | |
| 760 | type Result = bool; | |
| 761 | type Sorting = UpperBoundSorting<F>; | |
| 762 | ||
| 763 | fn refine( | |
| 764 | &self, | |
| 765 | aggregator : &Bounds<F>, | |
| 766 | _cube : &Cube<F, N>, | |
| 
9
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
767 | _data : &[G::Id], | 
| 5 | 768 | _generator : &G, | 
| 769 | step : usize | |
| 770 | ) -> RefinerResult<Bounds<F>, Self::Result> { | |
| 771 | if aggregator.lower() >= self.bound - self.tolerance { | |
| 772 | // Above lower bound within tolerances. Indicate uncertain success. | |
| 773 | RefinerResult::Uncertain(*aggregator, true) | |
| 774 | } else if aggregator.upper() <= self.bound + self.tolerance { | |
| 775 | // Below lower bound within tolerances. Indicate certain failure. | |
| 776 | RefinerResult::Certain(false) | |
| 777 | } else if step < self.max_steps { | |
| 778 | // No decision possible, but within step bounds - further subdivision is required. | |
| 779 | RefinerResult::NeedRefinement | |
| 780 | } else { | |
| 781 | // No decision possible, but past step bounds | |
| 782 | RefinerResult::Uncertain(*aggregator, false) | |
| 783 | } | |
| 784 | } | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
785 | |
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
786 | fn fuse_results(r1 : &mut Self::Result, r2 : Self::Result) { | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
787 | *r1 = *r1 && r2; | 
| 
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
788 | } | 
| 5 | 789 | } | 
| 0 | 790 | |
| 
9
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
791 | // FIXME: The most likely reason for the “Refiner failure” expectation in the methods below | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
792 | // is numerical inaccuracy: the `glb` maintained in `HeapContainer` (`refine.rs`) becomes bigger | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
793 | // than the *upper bound* of nodes attempted to be inserted into the `heap` in the container. | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
794 | // But the `glb` is there exactly to prevent that. Due to numerical inaccuracy, however, a | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
795 | // newly subdivided node may have lower upper bound than the original lower bound that should | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
796 | // have been above the `glb` since the node was picked from the queue. Due to the subdivision | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
797 | // process, if a node whose lower bound is at the `glb` is picked, all of its refined subnodes | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
798 | // should have lower bound at least the old `glb`, so in a single-threaded situation there should | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
799 | // always be nodes above the `glb` in the queue. In a multi-threaded situation a node below the | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
800 | // `glb` may be picked by some thread. When that happens, that thread inserts no new nodes into | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
801 | // the queue. If the queue empties as a result of that, the thread goes to wait for other threads | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
802 | // to produce results. Since some node had a node whose lower bound was above the `glb`, eventually | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
803 | // there should be a result, or new nodes above the `glb` inserted into the queue. Then the waiting | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
804 | // threads can also continue processing. If, however, numerical inaccuracy destroyes the `glb`, | 
| 
 
f40dfaf2166d
Improvements and minor fixes to bisection tree refinement.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
8 
diff
changeset
 | 
805 | // the queue may run out, and we get “Refiner failure”. | 
| 0 | 806 | impl<F : Float, G, BT, const N : usize> BTFN<F, G, BT, N> | 
| 807 | where BT : BTSearch<F, N, Agg=Bounds<F>>, | |
| 808 | G : SupportGenerator<F, N, Id=BT::Data>, | |
| 
13
 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
9 
diff
changeset
 | 
809 | G::SupportType : Mapping<Loc<F, N>,Codomain=F> | 
| 0 | 810 | + LocalAnalysis<F, Bounds<F>, N>, | 
| 811 | Cube<F, N> : P2Minimise<Loc<F, N>, F> { | |
| 812 | ||
| 5 | 813 | /// Maximise the `BTFN` within stated value `tolerance`. | 
| 814 | /// | |
| 815 | /// At most `max_steps` refinement steps are taken. | |
| 816 | /// Returns the approximate maximiser and the corresponding function value. | |
| 0 | 817 | pub fn maximise(&mut self, tolerance : F, max_steps : usize) -> (Loc<F, N>, F) { | 
| 818 | let refiner = P2Refiner{ tolerance, max_steps, how : RefineMax, bound : None }; | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
819 | self.bt.search_and_refine(refiner, &self.generator).expect("Refiner failure.").unwrap() | 
| 0 | 820 | } | 
| 821 | ||
| 5 | 822 | /// Maximise the `BTFN` within stated value `tolerance` subject to a lower bound. | 
| 823 | /// | |
| 824 | /// At most `max_steps` refinement steps are taken. | |
| 825 | /// Returns the approximate maximiser and the corresponding function value when one is found | |
| 826 | /// above the `bound` threshold, otherwise `None`. | |
| 0 | 827 | pub fn maximise_above(&mut self, bound : F, tolerance : F, max_steps : usize) | 
| 828 | -> Option<(Loc<F, N>, F)> { | |
| 829 | let refiner = P2Refiner{ tolerance, max_steps, how : RefineMax, bound : Some(bound) }; | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
830 | self.bt.search_and_refine(refiner, &self.generator).expect("Refiner failure.") | 
| 0 | 831 | } | 
| 832 | ||
| 5 | 833 | /// Minimise the `BTFN` within stated value `tolerance`. | 
| 834 | /// | |
| 835 | /// At most `max_steps` refinement steps are taken. | |
| 836 | /// Returns the approximate minimiser and the corresponding function value. | |
| 0 | 837 | pub fn minimise(&mut self, tolerance : F, max_steps : usize) -> (Loc<F, N>, F) { | 
| 838 | let refiner = P2Refiner{ tolerance, max_steps, how : RefineMin, bound : None }; | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
839 | self.bt.search_and_refine(refiner, &self.generator).expect("Refiner failure.").unwrap() | 
| 0 | 840 | } | 
| 841 | ||
| 5 | 842 | /// Minimise the `BTFN` within stated value `tolerance` subject to a lower bound. | 
| 843 | /// | |
| 844 | /// At most `max_steps` refinement steps are taken. | |
| 845 | /// Returns the approximate minimiser and the corresponding function value when one is found | |
| 846 | /// above the `bound` threshold, otherwise `None`. | |
| 0 | 847 | pub fn minimise_below(&mut self, bound : F, tolerance : F, max_steps : usize) | 
| 848 | -> Option<(Loc<F, N>, F)> { | |
| 849 | let refiner = P2Refiner{ tolerance, max_steps, how : RefineMin, bound : Some(bound) }; | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
850 | self.bt.search_and_refine(refiner, &self.generator).expect("Refiner failure.") | 
| 0 | 851 | } | 
| 5 | 852 | |
| 853 | /// Verify that the `BTFN` has a given upper `bound` within indicated `tolerance`. | |
| 854 | /// | |
| 855 | /// At most `max_steps` refinement steps are taken. | |
| 0 | 856 | pub fn has_upper_bound(&mut self, bound : F, tolerance : F, max_steps : usize) -> bool { | 
| 857 | let refiner = BoundRefiner{ bound, tolerance, max_steps, how : RefineMax }; | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
858 | self.bt.search_and_refine(refiner, &self.generator).expect("Refiner failure.") | 
| 0 | 859 | } | 
| 5 | 860 | |
| 861 | /// Verify that the `BTFN` has a given lower `bound` within indicated `tolerance`. | |
| 862 | /// | |
| 863 | /// At most `max_steps` refinement steps are taken. | |
| 864 | pub fn has_lower_bound(&mut self, bound : F, tolerance : F, max_steps : usize) -> bool { | |
| 865 | let refiner = BoundRefiner{ bound, tolerance, max_steps, how : RefineMin }; | |
| 
8
 
4e09b7829b51
Multithreaded bisection tree operations
 
Tuomo Valkonen <tuomov@iki.fi> 
parents: 
5 
diff
changeset
 | 
866 | self.bt.search_and_refine(refiner, &self.generator).expect("Refiner failure.") | 
| 5 | 867 | } | 
| 0 | 868 | } |