Sun, 27 Apr 2025 15:03:51 -0500
Bump alg_tools version requirement
| 0 | 1 | //! Type definitions and re-exports |
| 2 | ||
| 3 | use numeric_literals::replace_float_literals; | |
| 4 | ||
| 5 | use colored::ColoredString; | |
| 6 | use serde::{Serialize, Deserialize}; | |
| 7 | use alg_tools::iterate::LogRepr; | |
| 8 | use alg_tools::euclidean::Euclidean; | |
| 9 | use alg_tools::norms::{Norm, L1}; | |
| 10 | ||
| 11 | pub use alg_tools::types::*; | |
| 12 | pub use alg_tools::loc::Loc; | |
| 13 | pub use alg_tools::sets::Cube; | |
| 14 | ||
| 35 | 15 | // use crate::measures::DiscreteMeasure; |
| 0 | 16 | |
| 17 | /// [`Float`] with extra display and string conversion traits such that [`clap`] doesn't choke up. | |
| 18 | pub trait ClapFloat : Float | |
| 19 | + std::str::FromStr<Err=std::num::ParseFloatError> | |
| 20 | + std::fmt::Display {} | |
| 21 | impl ClapFloat for f32 {} | |
| 22 | impl ClapFloat for f64 {} | |
| 23 | ||
| 24 | /// Structure for storing iteration statistics | |
| 25 | #[derive(Debug, Clone, Serialize)] | |
| 26 | pub struct IterInfo<F : Float, const N : usize> { | |
| 27 | /// Function value | |
| 28 | pub value : F, | |
|
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
29 | /// Number of spikes |
| 0 | 30 | pub n_spikes : usize, |
| 31 | /// Number of iterations this statistic covers | |
| 32 | pub this_iters : usize, | |
| 35 | 33 | /// Number of spikes inserted since last IterInfo statistic |
| 34 | pub inserted : usize, | |
| 0 | 35 | /// Number of spikes removed by merging since last IterInfo statistic |
| 36 | pub merged : usize, | |
| 37 | /// Number of spikes removed by pruning since last IterInfo statistic | |
| 38 | pub pruned : usize, | |
| 39 | /// Number of inner iterations since last IterInfo statistic | |
| 40 | pub inner_iters : usize, | |
|
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
41 | /// Tuple of (transported mass, source mass) |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
42 | pub untransported_fraction : Option<(F, F)>, |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
43 | /// Tuple of (|destination mass - untransported_mass|, transported mass) |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
44 | pub transport_error : Option<(F, F)>, |
| 0 | 45 | /// Current tolerance |
| 46 | pub ε : F, | |
| 35 | 47 | // /// Solve fin.dim problem for this measure to get the optimal `value`. |
| 48 | // pub postprocessing : Option<RNDM<F, N>>, | |
| 0 | 49 | } |
| 50 | ||
| 32 | 51 | impl<F : Float, const N : usize> IterInfo<F, N> { |
| 52 | /// Initialise statistics with zeros. `ε` and `value` are unspecified. | |
| 53 | pub fn new() -> Self { | |
| 54 | IterInfo { | |
| 55 | value : F::NAN, | |
| 56 | n_spikes : 0, | |
| 57 | this_iters : 0, | |
| 58 | merged : 0, | |
| 35 | 59 | inserted : 0, |
| 32 | 60 | pruned : 0, |
| 61 | inner_iters : 0, | |
| 62 | ε : F::NAN, | |
| 35 | 63 | // postprocessing : None, |
|
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
64 | untransported_fraction : None, |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
65 | transport_error : None, |
| 32 | 66 | } |
| 67 | } | |
| 68 | } | |
| 69 | ||
|
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
70 | #[replace_float_literals(F::cast_from(literal))] |
| 0 | 71 | impl<F, const N : usize> LogRepr for IterInfo<F, N> where F : LogRepr + Float { |
| 72 | fn logrepr(&self) -> ColoredString { | |
| 35 | 73 | format!("{}\t| N = {}, ε = {:.8}, 𝔼inner_it = {}, 𝔼ins/mer/pru = {}/{}/{}{}{}", |
| 0 | 74 | self.value.logrepr(), |
| 75 | self.n_spikes, | |
| 76 | self.ε, | |
| 35 | 77 | self.inner_iters as float / self.this_iters.max(1) as float, |
| 78 | self.inserted as float / self.this_iters.max(1) as float, | |
| 79 | self.merged as float / self.this_iters.max(1) as float, | |
| 80 | self.pruned as float / self.this_iters.max(1) as float, | |
|
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
81 | match self.untransported_fraction { |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
82 | None => format!(""), |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
83 | Some((a, b)) => if b > 0.0 { |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
84 | format!(", untransported {:.2}%", 100.0*a/b) |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
85 | } else { |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
86 | format!("") |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
87 | } |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
88 | }, |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
89 | match self.transport_error { |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
90 | None => format!(""), |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
91 | Some((a, b)) => if b > 0.0 { |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
92 | format!(", transport error {:.2}%", 100.0*a/b) |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
93 | } else { |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
94 | format!("") |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
95 | } |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
96 | } |
| 0 | 97 | ).as_str().into() |
| 98 | } | |
| 99 | } | |
| 100 | ||
| 101 | /// Branch and bound refinement settings | |
| 102 | #[derive(Clone, Copy, Eq, PartialEq, Serialize, Deserialize, Debug)] | |
| 103 | #[serde(default)] | |
| 104 | pub struct RefinementSettings<F : Float> { | |
| 105 | /// Function value tolerance multiplier for bisection tree refinement in | |
| 106 | /// [`alg_tools::bisection_tree::BTFN::maximise`] and related functions. | |
| 107 | pub tolerance_mult : F, | |
| 108 | /// Maximum branch and bound steps | |
| 109 | pub max_steps : usize, | |
| 110 | } | |
| 111 | ||
| 112 | #[replace_float_literals(F::cast_from(literal))] | |
| 113 | impl<F : Float> Default for RefinementSettings<F> { | |
| 114 | fn default() -> Self { | |
| 115 | RefinementSettings { | |
| 116 | tolerance_mult : 0.1, | |
| 117 | max_steps : 50000, | |
| 118 | } | |
| 119 | } | |
| 120 | } | |
| 121 | ||
| 122 | /// Data term type | |
| 35 | 123 | #[derive(Clone, Copy, PartialEq, Serialize, Deserialize, Debug)] |
| 0 | 124 | pub enum DataTerm { |
| 125 | /// $\\|z\\|\_2^2/2$ | |
| 126 | L2Squared, | |
| 127 | /// $\\|z\\|\_1$ | |
| 128 | L1, | |
| 129 | } | |
| 130 | ||
| 131 | impl DataTerm { | |
| 132 | /// Calculate the data term value at residual $z=Aμ - b$. | |
| 133 | pub fn value_at_residual<F : Float, E : Euclidean<F> + Norm<F, L1>>(&self, z : E) -> F { | |
| 134 | match self { | |
| 135 | Self::L2Squared => z.norm2_squared_div2(), | |
| 136 | Self::L1 => z.norm(L1), | |
| 137 | } | |
| 138 | } | |
| 139 | } | |
| 32 | 140 | |
| 141 | /// Type for indicating norm-2-squared data fidelity or transport cost. | |
| 142 | #[derive(Clone, Copy, Serialize, Deserialize)] | |
| 143 | pub struct L2Squared; | |
| 144 | ||
| 145 | /// Trait for indicating that `Self` is Lipschitz with respect to the (semi)norm `D`. | |
| 35 | 146 | pub trait Lipschitz<M> { |
| 32 | 147 | /// The type of floats |
| 148 | type FloatType : Float; | |
| 149 | ||
| 150 | /// Returns the Lipschitz factor of `self` with respect to the (semi)norm `D`. | |
| 35 | 151 | fn lipschitz_factor(&self, seminorm : M) -> Option<Self::FloatType>; |
| 32 | 152 | } |
| 35 | 153 | |
| 154 | /// Trait for norm-bounded functions. | |
| 155 | pub trait NormBounded<M> { | |
| 156 | type FloatType : Float; | |
| 157 | ||
| 158 | /// Returns a bound on the values of this function object in the `M`-norm. | |
| 159 | fn norm_bound(&self, m : M) -> Self::FloatType; | |
| 160 | } |