Sun, 27 Apr 2025 20:29:43 -0500
Fix build with stable rust.
For optimisations, build.rs now automatically sets a nightly cfg flag,
so problems with the nightly feature are avoided. It is still used for
required for additional nightly-only features.
| 0 | 1 | |
| 5 | 2 | /*! | 
| 75 
e9f4550cfa18
Fix out-of-date references in doc comments
 Tuomo Valkonen <tuomov@iki.fi> parents: 
68diff
changeset | 3 | Traits for representing the support of a [`Mapping`], and analysing the mapping on a [`Cube`]. | 
| 5 | 4 | */ | 
| 0 | 5 | use serde::Serialize; | 
| 6 | use std::ops::{MulAssign,DivAssign,Neg}; | |
| 5 | 7 | use crate::types::{Float, Num}; | 
| 8 | use crate::maputil::map2; | |
| 59 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 9 | use crate::mapping::{ | 
| 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 10 | Instance, Mapping, DifferentiableImpl, DifferentiableMapping, Space | 
| 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 11 | }; | 
| 5 | 12 | use crate::sets::Cube; | 
| 13 | use crate::loc::Loc; | |
| 0 | 14 | use super::aggregator::Bounds; | 
| 15 | use crate::norms::{Norm, L1, L2, Linfinity}; | |
| 68 
c5f70e767511
Split out and generalise Weighted
 Tuomo Valkonen <tuomov@iki.fi> parents: 
59diff
changeset | 16 | pub use crate::operator_arithmetic::{Weighted, Constant}; | 
| 0 | 17 | |
| 75 
e9f4550cfa18
Fix out-of-date references in doc comments
 Tuomo Valkonen <tuomov@iki.fi> parents: 
68diff
changeset | 18 | /// A trait for working with the supports of [`Mapping`]s. | 
| 5 | 19 | /// | 
| 75 
e9f4550cfa18
Fix out-of-date references in doc comments
 Tuomo Valkonen <tuomov@iki.fi> parents: 
68diff
changeset | 20 | /// `Mapping` is not a super-trait to allow more general use. | 
| 8 
4e09b7829b51
Multithreaded bisection tree operations
 Tuomo Valkonen <tuomov@iki.fi> parents: 
5diff
changeset | 21 | pub trait Support<F : Num, const N : usize> : Sized + Sync + Send + 'static { | 
| 5 | 22 | /// Return a cube containing the support of the function represented by `self`. | 
| 23 | /// | |
| 24 | /// The hint may be larger than the actual support, but must contain it. | |
| 0 | 25 | fn support_hint(&self) -> Cube<F,N>; | 
| 26 | ||
| 5 | 27 | /// Indicate whether `x` is in the support of the function represented by `self`. | 
| 0 | 28 | fn in_support(&self, x : &Loc<F,N>) -> bool; | 
| 29 | ||
| 5 | 30 | // Indicate whether `cube` is fully in the support of the function represented by `self`. | 
| 0 | 31 | //fn fully_in_support(&self, cube : &Cube<F,N>) -> bool; | 
| 32 | ||
| 5 | 33 | /// Return an optional hint for bisecting the support. | 
| 34 | /// | |
| 35 | /// The output along each axis a possible coordinate at which to bisect `cube`. | |
| 36 | /// | |
| 37 | /// This is useful for nonsmooth functions to make finite element models as used by | |
| 38 | /// [`BTFN`][super::btfn::BTFN] minimisation/maximisation compatible with points of | |
| 39 | /// non-differentiability. | |
| 40 | /// | |
| 41 | /// The default implementation returns `[None; N]`. | |
| 0 | 42 | #[inline] | 
| 5 | 43 | #[allow(unused_variables)] | 
| 44 | fn bisection_hint(&self, cube : &Cube<F, N>) -> [Option<F>; N] { | |
| 45 | [None; N] | |
| 0 | 46 | } | 
| 47 | ||
| 5 | 48 | /// Translate `self` by `x`. | 
| 0 | 49 | #[inline] | 
| 50 | fn shift(self, x : Loc<F, N>) -> Shift<Self, F, N> { | |
| 51 | Shift { shift : x, base_fn : self } | |
| 52 | } | |
| 53 | } | |
| 54 | ||
| 75 
e9f4550cfa18
Fix out-of-date references in doc comments
 Tuomo Valkonen <tuomov@iki.fi> parents: 
68diff
changeset | 55 | /// Trait for globally analysing a property `A` of a [`Mapping`]. | 
| 5 | 56 | /// | 
| 57 | /// Typically `A` is an [`Aggregator`][super::aggregator::Aggregator] such as | |
| 58 | /// [`Bounds`][super::aggregator::Bounds]. | |
| 0 | 59 | pub trait GlobalAnalysis<F : Num, A> { | 
| 5 | 60 | /// Perform global analysis of the property `A` of `Self`. | 
| 61 | /// | |
| 62 | /// As an example, in the case of `A` being [`Bounds`][super::aggregator::Bounds], | |
| 63 | /// this function will return global upper and lower bounds for the mapping | |
| 64 | /// represented by `self`. | |
| 0 | 65 | fn global_analysis(&self) -> A; | 
| 66 | } | |
| 67 | ||
| 68 | // default impl<F, A, N, L> GlobalAnalysis<F, A, N> for L | |
| 69 | // where L : LocalAnalysis<F, A, N> { | |
| 70 | // #[inline] | |
| 71 | // fn global_analysis(&self) -> Bounds<F> { | |
| 72 | // self.local_analysis(&self.support_hint()) | |
| 73 | // } | |
| 74 | // } | |
| 75 | ||
| 75 
e9f4550cfa18
Fix out-of-date references in doc comments
 Tuomo Valkonen <tuomov@iki.fi> parents: 
68diff
changeset | 76 | /// Trait for locally analysing a property `A` of a [`Mapping`] (implementing [`Support`]) | 
| 5 | 77 | /// within a [`Cube`]. | 
| 78 | /// | |
| 79 | /// Typically `A` is an [`Aggregator`][super::aggregator::Aggregator] such as | |
| 80 | /// [`Bounds`][super::aggregator::Bounds]. | |
| 0 | 81 | pub trait LocalAnalysis<F : Num, A, const N : usize> : GlobalAnalysis<F, A> + Support<F, N> { | 
| 5 | 82 | /// Perform local analysis of the property `A` of `Self`. | 
| 83 | /// | |
| 84 | /// As an example, in the case of `A` being [`Bounds`][super::aggregator::Bounds], | |
| 85 | /// this function will return upper and lower bounds within `cube` for the mapping | |
| 86 | /// represented by `self`. | |
| 0 | 87 | fn local_analysis(&self, cube : &Cube<F, N>) -> A; | 
| 88 | } | |
| 89 | ||
| 75 
e9f4550cfa18
Fix out-of-date references in doc comments
 Tuomo Valkonen <tuomov@iki.fi> parents: 
68diff
changeset | 90 | /// Trait for determining the upper and lower bounds of an float-valued [`Mapping`]. | 
| 5 | 91 | /// | 
| 0 | 92 | /// This is a blanket-implemented alias for [`GlobalAnalysis`]`<F, Bounds<F>>` | 
| 75 
e9f4550cfa18
Fix out-of-date references in doc comments
 Tuomo Valkonen <tuomov@iki.fi> parents: 
68diff
changeset | 93 | /// [`Mapping`] is not a supertrait to allow flexibility in the implementation of either | 
| 0 | 94 | /// reference or non-reference arguments. | 
| 95 | pub trait Bounded<F : Float> : GlobalAnalysis<F, Bounds<F>> { | |
| 96 | /// Return lower and upper bounds for the values of of `self`. | |
| 97 | #[inline] | |
| 98 | fn bounds(&self) -> Bounds<F> { | |
| 99 | self.global_analysis() | |
| 100 | } | |
| 101 | } | |
| 102 | ||
| 103 | impl<F : Float, T : GlobalAnalysis<F, Bounds<F>>> Bounded<F> for T { } | |
| 104 | ||
| 75 
e9f4550cfa18
Fix out-of-date references in doc comments
 Tuomo Valkonen <tuomov@iki.fi> parents: 
68diff
changeset | 105 | /// Shift of [`Support`] and [`Mapping`]; output of [`Support::shift`]. | 
| 0 | 106 | #[derive(Copy,Clone,Debug,Serialize)] // Serialize! but not implemented by Loc. | 
| 107 | pub struct Shift<T, F, const N : usize> { | |
| 108 | shift : Loc<F, N>, | |
| 109 | base_fn : T, | |
| 110 | } | |
| 111 | ||
| 59 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 112 | impl<'a, T, V : Space, F : Float, const N : usize> Mapping<Loc<F, N>> for Shift<T,F,N> | 
| 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 113 | where T : Mapping<Loc<F, N>, Codomain=V> { | 
| 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 114 | type Codomain = V; | 
| 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 115 | |
| 0 | 116 | #[inline] | 
| 59 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 117 | fn apply<I : Instance<Loc<F, N>>>(&self, x : I) -> Self::Codomain { | 
| 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 118 | self.base_fn.apply(x.own() - &self.shift) | 
| 0 | 119 | } | 
| 120 | } | |
| 121 | ||
| 59 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 122 | impl<'a, T, V : Space, F : Float, const N : usize> DifferentiableImpl<Loc<F, N>> for Shift<T,F,N> | 
| 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 123 | where T : DifferentiableMapping<Loc<F, N>, DerivativeDomain=V> { | 
| 47 
a0db98c16ab5
Some Differentiable simplifications and clarifications
 Tuomo Valkonen <tuomov@iki.fi> parents: 
30diff
changeset | 124 | type Derivative = V; | 
| 59 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 125 | |
| 30 
9f2214c961cb
Implement Differentiable for Weighted and Shift
 Tuomo Valkonen <tuomov@iki.fi> parents: 
15diff
changeset | 126 | #[inline] | 
| 59 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 127 | fn differential_impl<I : Instance<Loc<F, N>>>(&self, x : I) -> Self::Derivative { | 
| 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 128 | self.base_fn.differential(x.own() - &self.shift) | 
| 30 
9f2214c961cb
Implement Differentiable for Weighted and Shift
 Tuomo Valkonen <tuomov@iki.fi> parents: 
15diff
changeset | 129 | } | 
| 
9f2214c961cb
Implement Differentiable for Weighted and Shift
 Tuomo Valkonen <tuomov@iki.fi> parents: 
15diff
changeset | 130 | } | 
| 
9f2214c961cb
Implement Differentiable for Weighted and Shift
 Tuomo Valkonen <tuomov@iki.fi> parents: 
15diff
changeset | 131 | |
| 0 | 132 | impl<'a, T, F : Float, const N : usize> Support<F,N> for Shift<T,F,N> | 
| 133 | where T : Support<F, N> { | |
| 134 | #[inline] | |
| 135 | fn support_hint(&self) -> Cube<F,N> { | |
| 136 | self.base_fn.support_hint().shift(&self.shift) | |
| 137 | } | |
| 138 | ||
| 139 | #[inline] | |
| 140 | fn in_support(&self, x : &Loc<F,N>) -> bool { | |
| 141 | self.base_fn.in_support(&(x - &self.shift)) | |
| 142 | } | |
| 143 | ||
| 144 | // fn fully_in_support(&self, _cube : &Cube<F,N>) -> bool { | |
| 145 | // //self.base_fn.fully_in_support(cube.shift(&vectorneg(self.shift))) | |
| 146 | // todo!("Not implemented, but not used at the moment") | |
| 147 | // } | |
| 148 | ||
| 149 | #[inline] | |
| 150 | fn bisection_hint(&self, cube : &Cube<F,N>) -> [Option<F>; N] { | |
| 151 | let base_hint = self.base_fn.bisection_hint(cube); | |
| 152 | map2(base_hint, &self.shift, |h, s| h.map(|z| z + *s)) | |
| 153 | } | |
| 154 | ||
| 155 | } | |
| 156 | ||
| 157 | impl<'a, T, F : Float, const N : usize> GlobalAnalysis<F, Bounds<F>> for Shift<T,F,N> | |
| 158 | where T : LocalAnalysis<F, Bounds<F>, N> { | |
| 159 | #[inline] | |
| 160 | fn global_analysis(&self) -> Bounds<F> { | |
| 161 | self.base_fn.global_analysis() | |
| 162 | } | |
| 163 | } | |
| 164 | ||
| 165 | impl<'a, T, F : Float, const N : usize> LocalAnalysis<F, Bounds<F>, N> for Shift<T,F,N> | |
| 166 | where T : LocalAnalysis<F, Bounds<F>, N> { | |
| 167 | #[inline] | |
| 168 | fn local_analysis(&self, cube : &Cube<F, N>) -> Bounds<F> { | |
| 169 | self.base_fn.local_analysis(&cube.shift(&(-self.shift))) | |
| 170 | } | |
| 171 | } | |
| 172 | ||
| 173 | macro_rules! impl_shift_norm { | |
| 174 | ($($norm:ident)*) => { $( | |
| 175 | impl<'a, T, F : Float, const N : usize> Norm<F, $norm> for Shift<T,F,N> | |
| 176 | where T : Norm<F, $norm> { | |
| 177 | #[inline] | |
| 178 | fn norm(&self, n : $norm) -> F { | |
| 179 | self.base_fn.norm(n) | |
| 180 | } | |
| 181 | } | |
| 182 | )* } | |
| 183 | } | |
| 184 | ||
| 185 | impl_shift_norm!(L1 L2 Linfinity); | |
| 186 | ||
| 187 | impl<'a, T, F : Float, C, const N : usize> Support<F,N> for Weighted<T, C> | |
| 188 | where T : Support<F, N>, | |
| 189 | C : Constant<Type=F> { | |
| 190 | ||
| 191 | #[inline] | |
| 192 | fn support_hint(&self) -> Cube<F,N> { | |
| 193 | self.base_fn.support_hint() | |
| 194 | } | |
| 195 | ||
| 196 | #[inline] | |
| 197 | fn in_support(&self, x : &Loc<F,N>) -> bool { | |
| 198 | self.base_fn.in_support(x) | |
| 199 | } | |
| 200 | ||
| 201 | // fn fully_in_support(&self, cube : &Cube<F,N>) -> bool { | |
| 202 | // self.base_fn.fully_in_support(cube) | |
| 203 | // } | |
| 204 | ||
| 205 | #[inline] | |
| 206 | fn bisection_hint(&self, cube : &Cube<F,N>) -> [Option<F>; N] { | |
| 207 | self.base_fn.bisection_hint(cube) | |
| 208 | } | |
| 209 | } | |
| 210 | ||
| 211 | impl<'a, T, F : Float, C> GlobalAnalysis<F, Bounds<F>> for Weighted<T, C> | |
| 212 | where T : GlobalAnalysis<F, Bounds<F>>, | |
| 213 | C : Constant<Type=F> { | |
| 214 | #[inline] | |
| 215 | fn global_analysis(&self) -> Bounds<F> { | |
| 216 | let Bounds(lower, upper) = self.base_fn.global_analysis(); | |
| 8 
4e09b7829b51
Multithreaded bisection tree operations
 Tuomo Valkonen <tuomov@iki.fi> parents: 
5diff
changeset | 217 | debug_assert!(lower <= upper); | 
| 0 | 218 | match self.weight.value() { | 
| 219 | w if w < F::ZERO => Bounds(w * upper, w * lower), | |
| 220 | w => Bounds(w * lower, w * upper), | |
| 221 | } | |
| 222 | } | |
| 223 | } | |
| 224 | ||
| 225 | impl<'a, T, F : Float, C, const N : usize> LocalAnalysis<F, Bounds<F>, N> for Weighted<T, C> | |
| 226 | where T : LocalAnalysis<F, Bounds<F>, N>, | |
| 227 | C : Constant<Type=F> { | |
| 228 | #[inline] | |
| 229 | fn local_analysis(&self, cube : &Cube<F, N>) -> Bounds<F> { | |
| 230 | let Bounds(lower, upper) = self.base_fn.local_analysis(cube); | |
| 8 
4e09b7829b51
Multithreaded bisection tree operations
 Tuomo Valkonen <tuomov@iki.fi> parents: 
5diff
changeset | 231 | debug_assert!(lower <= upper); | 
| 0 | 232 | match self.weight.value() { | 
| 233 | w if w < F::ZERO => Bounds(w * upper, w * lower), | |
| 234 | w => Bounds(w * lower, w * upper), | |
| 235 | } | |
| 236 | } | |
| 237 | } | |
| 238 | ||
| 239 | macro_rules! make_weighted_scalarop_rhs { | |
| 240 | ($trait:ident, $fn:ident, $trait_assign:ident, $fn_assign:ident) => { | |
| 241 | impl<F : Float, T> std::ops::$trait_assign<F> for Weighted<T, F> { | |
| 242 | #[inline] | |
| 243 | fn $fn_assign(&mut self, t : F) { | |
| 244 | self.weight.$fn_assign(t); | |
| 245 | } | |
| 246 | } | |
| 247 | ||
| 248 | impl<'a, F : Float, T> std::ops::$trait<F> for Weighted<T, F> { | |
| 249 | type Output = Self; | |
| 250 | #[inline] | |
| 251 | fn $fn(mut self, t : F) -> Self { | |
| 252 | self.weight.$fn_assign(t); | |
| 253 | self | |
| 254 | } | |
| 255 | } | |
| 256 | ||
| 257 | impl<'a, F : Float, T> std::ops::$trait<F> for &'a Weighted<T, F> | |
| 258 | where T : Clone { | |
| 259 | type Output = Weighted<T, F>; | |
| 260 | #[inline] | |
| 261 | fn $fn(self, t : F) -> Self::Output { | |
| 262 | Weighted { weight : self.weight.$fn(t), base_fn : self.base_fn.clone() } | |
| 263 | } | |
| 264 | } | |
| 265 | } | |
| 266 | } | |
| 267 | ||
| 268 | make_weighted_scalarop_rhs!(Mul, mul, MulAssign, mul_assign); | |
| 269 | make_weighted_scalarop_rhs!(Div, div, DivAssign, div_assign); | |
| 270 | ||
| 271 | macro_rules! impl_weighted_norm { | |
| 272 | ($($norm:ident)*) => { $( | |
| 273 | impl<'a, T, F : Float> Norm<F, $norm> for Weighted<T,F> | |
| 274 | where T : Norm<F, $norm> { | |
| 275 | #[inline] | |
| 276 | fn norm(&self, n : $norm) -> F { | |
| 277 | self.base_fn.norm(n) * self.weight.abs() | |
| 278 | } | |
| 279 | } | |
| 280 | )* } | |
| 281 | } | |
| 282 | ||
| 283 | impl_weighted_norm!(L1 L2 Linfinity); | |
| 284 | ||
| 285 | ||
| 75 
e9f4550cfa18
Fix out-of-date references in doc comments
 Tuomo Valkonen <tuomov@iki.fi> parents: 
68diff
changeset | 286 | /// Normalisation of [`Support`] and [`Mapping`] to L¹ norm 1. | 
| 5 | 287 | /// | 
| 0 | 288 | /// Currently only scalar-valued functions are supported. | 
| 289 | #[derive(Copy, Clone, Debug, Serialize, PartialEq)] | |
| 5 | 290 | pub struct Normalised<T>( | 
| 75 
e9f4550cfa18
Fix out-of-date references in doc comments
 Tuomo Valkonen <tuomov@iki.fi> parents: 
68diff
changeset | 291 | /// The base [`Support`] or [`Mapping`]. | 
| 5 | 292 | pub T | 
| 293 | ); | |
| 0 | 294 | |
| 59 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 295 | impl<'a, T, F : Float, const N : usize> Mapping<Loc<F, N>> for Normalised<T> | 
| 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 296 | where T : Norm<F, L1> + Mapping<Loc<F,N>, Codomain=F> { | 
| 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 297 | type Codomain = F; | 
| 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 298 | |
| 0 | 299 | #[inline] | 
| 59 
9226980e45a7
Significantly simplify Mapping / Apply through Instance
 Tuomo Valkonen <tuomov@iki.fi> parents: 
47diff
changeset | 300 | fn apply<I : Instance<Loc<F, N>>>(&self, x : I) -> Self::Codomain { | 
| 0 | 301 | let w = self.0.norm(L1); | 
| 13 
465fa2121ccb
Better Linear and Mapping structure that can provide consuming and reference `apply`.
 Tuomo Valkonen <tuomov@iki.fi> parents: 
8diff
changeset | 302 | if w == F::ZERO { F::ZERO } else { self.0.apply(x) / w } | 
| 0 | 303 | } | 
| 304 | } | |
| 305 | ||
| 306 | impl<'a, T, F : Float, const N : usize> Support<F,N> for Normalised<T> | |
| 307 | where T : Norm<F, L1> + Support<F, N> { | |
| 308 | ||
| 309 | #[inline] | |
| 310 | fn support_hint(&self) -> Cube<F,N> { | |
| 311 | self.0.support_hint() | |
| 312 | } | |
| 313 | ||
| 314 | #[inline] | |
| 315 | fn in_support(&self, x : &Loc<F,N>) -> bool { | |
| 316 | self.0.in_support(x) | |
| 317 | } | |
| 318 | ||
| 319 | // fn fully_in_support(&self, cube : &Cube<F,N>) -> bool { | |
| 320 | // self.0.fully_in_support(cube) | |
| 321 | // } | |
| 322 | ||
| 323 | #[inline] | |
| 324 | fn bisection_hint(&self, cube : &Cube<F,N>) -> [Option<F>; N] { | |
| 325 | self.0.bisection_hint(cube) | |
| 326 | } | |
| 327 | } | |
| 328 | ||
| 329 | impl<'a, T, F : Float> GlobalAnalysis<F, Bounds<F>> for Normalised<T> | |
| 330 | where T : Norm<F, L1> + GlobalAnalysis<F, Bounds<F>> { | |
| 331 | #[inline] | |
| 332 | fn global_analysis(&self) -> Bounds<F> { | |
| 333 | let Bounds(lower, upper) = self.0.global_analysis(); | |
| 8 
4e09b7829b51
Multithreaded bisection tree operations
 Tuomo Valkonen <tuomov@iki.fi> parents: 
5diff
changeset | 334 | debug_assert!(lower <= upper); | 
| 0 | 335 | let w = self.0.norm(L1); | 
| 336 | debug_assert!(w >= F::ZERO); | |
| 337 | Bounds(w * lower, w * upper) | |
| 338 | } | |
| 339 | } | |
| 340 | ||
| 341 | impl<'a, T, F : Float, const N : usize> LocalAnalysis<F, Bounds<F>, N> for Normalised<T> | |
| 342 | where T : Norm<F, L1> + LocalAnalysis<F, Bounds<F>, N> { | |
| 343 | #[inline] | |
| 344 | fn local_analysis(&self, cube : &Cube<F, N>) -> Bounds<F> { | |
| 345 | let Bounds(lower, upper) = self.0.local_analysis(cube); | |
| 8 
4e09b7829b51
Multithreaded bisection tree operations
 Tuomo Valkonen <tuomov@iki.fi> parents: 
5diff
changeset | 346 | debug_assert!(lower <= upper); | 
| 0 | 347 | let w = self.0.norm(L1); | 
| 348 | debug_assert!(w >= F::ZERO); | |
| 349 | Bounds(w * lower, w * upper) | |
| 350 | } | |
| 351 | } | |
| 352 | ||
| 353 | impl<'a, T, F : Float> Norm<F, L1> for Normalised<T> | |
| 354 | where T : Norm<F, L1> { | |
| 355 | #[inline] | |
| 356 | fn norm(&self, _ : L1) -> F { | |
| 357 | let w = self.0.norm(L1); | |
| 358 | if w == F::ZERO { F::ZERO } else { F::ONE } | |
| 359 | } | |
| 360 | } | |
| 361 | ||
| 362 | macro_rules! impl_normalised_norm { | |
| 363 | ($($norm:ident)*) => { $( | |
| 364 | impl<'a, T, F : Float> Norm<F, $norm> for Normalised<T> | |
| 365 | where T : Norm<F, $norm> + Norm<F, L1> { | |
| 366 | #[inline] | |
| 367 | fn norm(&self, n : $norm) -> F { | |
| 368 | let w = self.0.norm(L1); | |
| 369 | if w == F::ZERO { F::ZERO } else { self.0.norm(n) / w } | |
| 370 | } | |
| 371 | } | |
| 372 | )* } | |
| 373 | } | |
| 374 | ||
| 375 | impl_normalised_norm!(L2 Linfinity); | |
| 376 | ||
| 377 | /* | |
| 378 | impl<F : Num, S : Support<F, N>, const N : usize> LocalAnalysis<F, NullAggregator, N> for S { | |
| 379 | fn local_analysis(&self, _cube : &Cube<F, N>) -> NullAggregator { NullAggregator } | |
| 380 | } | |
| 381 | ||
| 382 | impl<F : Float, S : Bounded<F>, const N : usize> LocalAnalysis<F, Bounds<F>, N> for S { | |
| 383 | #[inline] | |
| 384 | fn local_analysis(&self, cube : &Cube<F, N>) -> Bounds<F> { | |
| 385 | self.bounds(cube) | |
| 386 | } | |
| 387 | }*/ | |
| 388 | ||
| 5 | 389 | /// Generator of [`Support`]-implementing component functions based on low storage requirement | 
| 390 | /// [ids][`Self::Id`]. | |
| 0 | 391 | pub trait SupportGenerator<F : Float, const N : usize> | 
| 8 
4e09b7829b51
Multithreaded bisection tree operations
 Tuomo Valkonen <tuomov@iki.fi> parents: 
5diff
changeset | 392 | : MulAssign<F> + DivAssign<F> + Neg<Output=Self> + Clone + Sync + Send + 'static { | 
| 5 | 393 | /// The identification type | 
| 0 | 394 | type Id : 'static + Copy; | 
| 75 
e9f4550cfa18
Fix out-of-date references in doc comments
 Tuomo Valkonen <tuomov@iki.fi> parents: 
68diff
changeset | 395 | /// The type of the [`Support`] (often also a [`Mapping`]). | 
| 0 | 396 | type SupportType : 'static + Support<F, N>; | 
| 5 | 397 | /// An iterator over all the [`Support`]s of the generator. | 
| 0 | 398 | type AllDataIter<'a> : Iterator<Item=(Self::Id, Self::SupportType)> where Self : 'a; | 
| 399 | ||
| 5 | 400 | /// Returns the component identified by `id`. | 
| 401 | /// | |
| 402 | /// Panics if `id` is an invalid identifier. | |
| 403 | fn support_for(&self, id : Self::Id) -> Self::SupportType; | |
| 0 | 404 | |
| 5 | 405 | /// Returns the number of different components in this generator. | 
| 0 | 406 | fn support_count(&self) -> usize; | 
| 407 | ||
| 5 | 408 | /// Returns an iterator over all pairs of `(id, support)`. | 
| 0 | 409 | fn all_data(&self) -> Self::AllDataIter<'_>; | 
| 410 | } | |
| 411 |