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