Sun, 27 Apr 2025 15:03:20 -0500
Start work on 3.0.0
| 0 | 1 | /*! |
| 2 | This module provides [`RunnableExperiment`] for running chosen algorithms on a chosen experiment. | |
| 3 | */ | |
| 4 | ||
| 5 | use numeric_literals::replace_float_literals; | |
| 6 | use colored::Colorize; | |
| 7 | use serde::{Serialize, Deserialize}; | |
| 8 | use serde_json; | |
| 9 | use nalgebra::base::DVector; | |
| 10 | use std::hash::Hash; | |
| 11 | use chrono::{DateTime, Utc}; | |
| 12 | use cpu_time::ProcessTime; | |
| 13 | use clap::ValueEnum; | |
| 14 | use std::collections::HashMap; | |
| 15 | use std::time::Instant; | |
| 16 | ||
| 17 | use rand::prelude::{ | |
| 18 | StdRng, | |
| 19 | SeedableRng | |
| 20 | }; | |
| 21 | use rand_distr::Distribution; | |
| 22 | ||
| 23 | use alg_tools::bisection_tree::*; | |
| 24 | use alg_tools::iterate::{ | |
| 25 | Timed, | |
| 26 | AlgIteratorOptions, | |
| 27 | Verbose, | |
| 28 | AlgIteratorFactory, | |
| 35 | 29 | LoggingIteratorFactory, |
| 30 | TimingIteratorFactory, | |
| 31 | BasicAlgIteratorFactory, | |
| 0 | 32 | }; |
| 33 | use alg_tools::logger::Logger; | |
| 35 | 34 | use alg_tools::error::{ |
| 35 | DynError, | |
| 36 | DynResult, | |
| 37 | }; | |
| 0 | 38 | use alg_tools::tabledump::TableDump; |
| 39 | use alg_tools::sets::Cube; | |
|
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
40 | use alg_tools::mapping::{ |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
41 | RealMapping, |
| 35 | 42 | DifferentiableMapping, |
| 43 | DifferentiableRealMapping, | |
| 44 | Instance | |
|
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
45 | }; |
| 0 | 46 | use alg_tools::nalgebra_support::ToNalgebraRealField; |
| 47 | use alg_tools::euclidean::Euclidean; | |
| 35 | 48 | use alg_tools::lingrid::{lingrid, LinSpace}; |
| 0 | 49 | use alg_tools::sets::SetOrd; |
| 35 | 50 | use alg_tools::linops::{RowOp, IdOp /*, ZeroOp*/}; |
| 51 | use alg_tools::discrete_gradient::{Grad, ForwardNeumann}; | |
| 52 | use alg_tools::convex::Zero; | |
| 53 | use alg_tools::maputil::map3; | |
| 54 | use alg_tools::direct_product::Pair; | |
| 0 | 55 | |
| 56 | use crate::kernels::*; | |
| 57 | use crate::types::*; | |
| 58 | use crate::measures::*; | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
59 | use crate::measures::merging::{SpikeMerging,SpikeMergingMethod}; |
| 0 | 60 | use crate::forward_model::*; |
| 35 | 61 | use crate::forward_model::sensor_grid::{ |
| 62 | SensorGrid, | |
| 63 | SensorGridBT, | |
| 64 | //SensorGridBTFN, | |
| 65 | Sensor, | |
| 66 | Spread, | |
| 67 | }; | |
| 68 | ||
| 0 | 69 | use crate::fb::{ |
| 70 | FBConfig, | |
| 32 | 71 | FBGenericConfig, |
|
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
72 | pointsource_fb_reg, |
| 32 | 73 | pointsource_fista_reg, |
| 74 | }; | |
| 75 | use crate::sliding_fb::{ | |
| 76 | SlidingFBConfig, | |
| 35 | 77 | TransportConfig, |
| 32 | 78 | pointsource_sliding_fb_reg |
| 0 | 79 | }; |
| 35 | 80 | use crate::sliding_pdps::{ |
| 81 | SlidingPDPSConfig, | |
| 82 | pointsource_sliding_pdps_pair | |
| 83 | }; | |
| 84 | use crate::forward_pdps::{ | |
| 85 | ForwardPDPSConfig, | |
| 86 | pointsource_forward_pdps_pair | |
| 87 | }; | |
| 0 | 88 | use crate::pdps::{ |
| 89 | PDPSConfig, | |
|
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
90 | pointsource_pdps_reg, |
| 0 | 91 | }; |
| 92 | use crate::frank_wolfe::{ | |
| 93 | FWConfig, | |
| 94 | FWVariant, | |
|
25
79943be70720
Implement non-negativity constraints for the conditional gradient methods
Tuomo Valkonen <tuomov@iki.fi>
parents:
24
diff
changeset
|
95 | pointsource_fw_reg, |
| 35 | 96 | //WeightOptim, |
| 0 | 97 | }; |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
98 | use crate::subproblem::{InnerSettings, InnerMethod}; |
| 0 | 99 | use crate::seminorms::*; |
| 100 | use crate::plot::*; | |
|
9
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
101 | use crate::{AlgorithmOverrides, CommandLineArgs}; |
|
20
90f77ad9a98d
Added command line option for (power) tolerance
Tuomo Valkonen <tuomov@iki.fi>
parents:
9
diff
changeset
|
102 | use crate::tolerance::Tolerance; |
| 32 | 103 | use crate::regularisation::{ |
| 104 | Regularisation, | |
| 105 | RadonRegTerm, | |
| 106 | NonnegRadonRegTerm | |
| 107 | }; | |
| 108 | use crate::dataterm::{ | |
| 109 | L1, | |
| 35 | 110 | L2Squared, |
| 32 | 111 | }; |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
112 | use crate::prox_penalty::{ |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
113 | RadonSquared, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
114 | //ProxPenalty, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
115 | }; |
| 35 | 116 | use alg_tools::norms::{L2, NormExponent}; |
| 117 | use alg_tools::operator_arithmetic::Weighted; | |
| 118 | use anyhow::anyhow; | |
| 0 | 119 | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
120 | /// Available proximal terms |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
121 | #[derive(Copy, Clone, Debug, Serialize, Deserialize)] |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
122 | pub enum ProxTerm { |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
123 | /// Partial-to-wave operator 𝒟. |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
124 | Wave, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
125 | /// Radon-norm squared |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
126 | RadonSquared |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
127 | } |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
128 | |
| 0 | 129 | /// Available algorithms and their configurations |
| 130 | #[derive(Copy, Clone, Debug, Serialize, Deserialize)] | |
| 131 | pub enum AlgorithmConfig<F : Float> { | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
132 | FB(FBConfig<F>, ProxTerm), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
133 | FISTA(FBConfig<F>, ProxTerm), |
| 0 | 134 | FW(FWConfig<F>), |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
135 | PDPS(PDPSConfig<F>, ProxTerm), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
136 | SlidingFB(SlidingFBConfig<F>, ProxTerm), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
137 | ForwardPDPS(ForwardPDPSConfig<F>, ProxTerm), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
138 | SlidingPDPS(SlidingPDPSConfig<F>, ProxTerm), |
| 0 | 139 | } |
| 140 | ||
|
20
90f77ad9a98d
Added command line option for (power) tolerance
Tuomo Valkonen <tuomov@iki.fi>
parents:
9
diff
changeset
|
141 | fn unpack_tolerance<F : Float>(v : &Vec<F>) -> Tolerance<F> { |
|
90f77ad9a98d
Added command line option for (power) tolerance
Tuomo Valkonen <tuomov@iki.fi>
parents:
9
diff
changeset
|
142 | assert!(v.len() == 3); |
|
90f77ad9a98d
Added command line option for (power) tolerance
Tuomo Valkonen <tuomov@iki.fi>
parents:
9
diff
changeset
|
143 | Tolerance::Power { initial : v[0], factor : v[1], exponent : v[2] } |
|
90f77ad9a98d
Added command line option for (power) tolerance
Tuomo Valkonen <tuomov@iki.fi>
parents:
9
diff
changeset
|
144 | } |
|
90f77ad9a98d
Added command line option for (power) tolerance
Tuomo Valkonen <tuomov@iki.fi>
parents:
9
diff
changeset
|
145 | |
| 0 | 146 | impl<F : ClapFloat> AlgorithmConfig<F> { |
| 147 | /// Override supported parameters based on the command line. | |
| 148 | pub fn cli_override(self, cli : &AlgorithmOverrides<F>) -> Self { | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
149 | let override_merging = |g : SpikeMergingMethod<F>| { |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
150 | SpikeMergingMethod { |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
151 | enabled : cli.merge.unwrap_or(g.enabled), |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
152 | radius : cli.merge_radius.unwrap_or(g.radius), |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
153 | interp : cli.merge_interp.unwrap_or(g.interp), |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
154 | } |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
155 | }; |
| 0 | 156 | let override_fb_generic = |g : FBGenericConfig<F>| { |
| 157 | FBGenericConfig { | |
| 158 | bootstrap_insertions : cli.bootstrap_insertions | |
| 159 | .as_ref() | |
| 160 | .map_or(g.bootstrap_insertions, | |
| 161 | |n| Some((n[0], n[1]))), | |
| 162 | merge_every : cli.merge_every.unwrap_or(g.merge_every), | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
163 | merging : override_merging(g.merging), |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
164 | final_merging : cli.final_merging.unwrap_or(g.final_merging), |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
165 | fitness_merging : cli.fitness_merging.unwrap_or(g.fitness_merging), |
|
20
90f77ad9a98d
Added command line option for (power) tolerance
Tuomo Valkonen <tuomov@iki.fi>
parents:
9
diff
changeset
|
166 | tolerance: cli.tolerance.as_ref().map(unpack_tolerance).unwrap_or(g.tolerance), |
| 0 | 167 | .. g |
| 168 | } | |
| 169 | }; | |
| 35 | 170 | let override_transport = |g : TransportConfig<F>| { |
| 171 | TransportConfig { | |
| 172 | θ0 : cli.theta0.unwrap_or(g.θ0), | |
| 46 | 173 | tolerance_mult_con: cli.transport_tolerance_pos.unwrap_or(g.tolerance_mult_con), |
| 35 | 174 | adaptation: cli.transport_adaptation.unwrap_or(g.adaptation), |
| 175 | .. g | |
| 176 | } | |
| 177 | }; | |
| 0 | 178 | |
| 179 | use AlgorithmConfig::*; | |
| 180 | match self { | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
181 | FB(fb, prox) => FB(FBConfig { |
| 0 | 182 | τ0 : cli.tau0.unwrap_or(fb.τ0), |
|
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
183 | generic : override_fb_generic(fb.generic), |
| 0 | 184 | .. fb |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
185 | }, prox), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
186 | FISTA(fb, prox) => FISTA(FBConfig { |
| 32 | 187 | τ0 : cli.tau0.unwrap_or(fb.τ0), |
|
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
188 | generic : override_fb_generic(fb.generic), |
| 32 | 189 | .. fb |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
190 | }, prox), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
191 | PDPS(pdps, prox) => PDPS(PDPSConfig { |
| 0 | 192 | τ0 : cli.tau0.unwrap_or(pdps.τ0), |
| 193 | σ0 : cli.sigma0.unwrap_or(pdps.σ0), | |
| 194 | acceleration : cli.acceleration.unwrap_or(pdps.acceleration), | |
|
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
195 | generic : override_fb_generic(pdps.generic), |
| 0 | 196 | .. pdps |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
197 | }, prox), |
| 0 | 198 | FW(fw) => FW(FWConfig { |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
199 | merging : override_merging(fw.merging), |
|
20
90f77ad9a98d
Added command line option for (power) tolerance
Tuomo Valkonen <tuomov@iki.fi>
parents:
9
diff
changeset
|
200 | tolerance : cli.tolerance.as_ref().map(unpack_tolerance).unwrap_or(fw.tolerance), |
| 0 | 201 | .. fw |
| 32 | 202 | }), |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
203 | SlidingFB(sfb, prox) => SlidingFB(SlidingFBConfig { |
| 32 | 204 | τ0 : cli.tau0.unwrap_or(sfb.τ0), |
| 35 | 205 | transport : override_transport(sfb.transport), |
| 32 | 206 | insertion : override_fb_generic(sfb.insertion), |
| 207 | .. sfb | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
208 | }, prox), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
209 | SlidingPDPS(spdps, prox) => SlidingPDPS(SlidingPDPSConfig { |
| 35 | 210 | τ0 : cli.tau0.unwrap_or(spdps.τ0), |
| 211 | σp0 : cli.sigmap0.unwrap_or(spdps.σp0), | |
| 212 | σd0 : cli.sigma0.unwrap_or(spdps.σd0), | |
| 213 | //acceleration : cli.acceleration.unwrap_or(pdps.acceleration), | |
| 214 | transport : override_transport(spdps.transport), | |
| 215 | insertion : override_fb_generic(spdps.insertion), | |
| 216 | .. spdps | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
217 | }, prox), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
218 | ForwardPDPS(fpdps, prox) => ForwardPDPS(ForwardPDPSConfig { |
| 35 | 219 | τ0 : cli.tau0.unwrap_or(fpdps.τ0), |
| 220 | σp0 : cli.sigmap0.unwrap_or(fpdps.σp0), | |
| 221 | σd0 : cli.sigma0.unwrap_or(fpdps.σd0), | |
| 222 | //acceleration : cli.acceleration.unwrap_or(pdps.acceleration), | |
| 223 | insertion : override_fb_generic(fpdps.insertion), | |
| 224 | .. fpdps | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
225 | }, prox), |
| 0 | 226 | } |
| 227 | } | |
| 228 | } | |
| 229 | ||
| 35 | 230 | /// Helper struct for tagging and [`AlgorithmConfig`] or [`ExperimentV2`] with a name. |
| 0 | 231 | #[derive(Clone, Debug, Serialize, Deserialize)] |
| 232 | pub struct Named<Data> { | |
| 233 | pub name : String, | |
| 234 | #[serde(flatten)] | |
| 235 | pub data : Data, | |
| 236 | } | |
| 237 | ||
| 238 | /// Shorthand algorithm configurations, to be used with the command line parser | |
|
9
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
239 | #[derive(ValueEnum, Debug, Copy, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)] |
| 0 | 240 | pub enum DefaultAlgorithm { |
| 241 | /// The μFB forward-backward method | |
| 242 | #[clap(name = "fb")] | |
| 243 | FB, | |
| 244 | /// The μFISTA inertial forward-backward method | |
| 245 | #[clap(name = "fista")] | |
| 246 | FISTA, | |
| 247 | /// The “fully corrective” conditional gradient method | |
| 248 | #[clap(name = "fw")] | |
| 249 | FW, | |
| 250 | /// The “relaxed conditional gradient method | |
| 251 | #[clap(name = "fwrelax")] | |
| 252 | FWRelax, | |
| 253 | /// The μPDPS primal-dual proximal splitting method | |
| 254 | #[clap(name = "pdps")] | |
| 255 | PDPS, | |
| 35 | 256 | /// The sliding FB method |
| 32 | 257 | #[clap(name = "sliding_fb", alias = "sfb")] |
| 258 | SlidingFB, | |
| 35 | 259 | /// The sliding PDPS method |
| 260 | #[clap(name = "sliding_pdps", alias = "spdps")] | |
| 261 | SlidingPDPS, | |
| 262 | /// The PDPS method with a forward step for the smooth function | |
| 263 | #[clap(name = "forward_pdps", alias = "fpdps")] | |
| 264 | ForwardPDPS, | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
265 | |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
266 | // Radon variants |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
267 | |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
268 | /// The μFB forward-backward method with radon-norm squared proximal term |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
269 | #[clap(name = "radon_fb")] |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
270 | RadonFB, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
271 | /// The μFISTA inertial forward-backward method with radon-norm squared proximal term |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
272 | #[clap(name = "radon_fista")] |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
273 | RadonFISTA, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
274 | /// The μPDPS primal-dual proximal splitting method with radon-norm squared proximal term |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
275 | #[clap(name = "radon_pdps")] |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
276 | RadonPDPS, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
277 | /// The sliding FB method with radon-norm squared proximal term |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
278 | #[clap(name = "radon_sliding_fb", alias = "radon_sfb")] |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
279 | RadonSlidingFB, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
280 | /// The sliding PDPS method with radon-norm squared proximal term |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
281 | #[clap(name = "radon_sliding_pdps", alias = "radon_spdps")] |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
282 | RadonSlidingPDPS, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
283 | /// The PDPS method with a forward step for the smooth function with radon-norm squared proximal term |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
284 | #[clap(name = "radon_forward_pdps", alias = "radon_fpdps")] |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
285 | RadonForwardPDPS, |
| 0 | 286 | } |
| 287 | ||
| 288 | impl DefaultAlgorithm { | |
| 289 | /// Returns the algorithm configuration corresponding to the algorithm shorthand | |
| 290 | pub fn default_config<F : Float>(&self) -> AlgorithmConfig<F> { | |
| 291 | use DefaultAlgorithm::*; | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
292 | let radon_insertion = FBGenericConfig { |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
293 | merging : SpikeMergingMethod{ interp : false, .. Default::default() }, |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
294 | inner : InnerSettings { |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
295 | method : InnerMethod::PDPS, // SSN not implemented |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
296 | .. Default::default() |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
297 | }, |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
298 | .. Default::default() |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
299 | }; |
| 0 | 300 | match *self { |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
301 | FB => AlgorithmConfig::FB(Default::default(), ProxTerm::Wave), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
302 | FISTA => AlgorithmConfig::FISTA(Default::default(), ProxTerm::Wave), |
| 0 | 303 | FW => AlgorithmConfig::FW(Default::default()), |
| 304 | FWRelax => AlgorithmConfig::FW(FWConfig{ | |
| 305 | variant : FWVariant::Relaxed, | |
| 306 | .. Default::default() | |
| 307 | }), | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
308 | PDPS => AlgorithmConfig::PDPS(Default::default(), ProxTerm::Wave), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
309 | SlidingFB => AlgorithmConfig::SlidingFB(Default::default(), ProxTerm::Wave), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
310 | SlidingPDPS => AlgorithmConfig::SlidingPDPS(Default::default(), ProxTerm::Wave), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
311 | ForwardPDPS => AlgorithmConfig::ForwardPDPS(Default::default(), ProxTerm::Wave), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
312 | |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
313 | // Radon variants |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
314 | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
315 | RadonFB => AlgorithmConfig::FB( |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
316 | FBConfig{ generic : radon_insertion, ..Default::default() }, |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
317 | ProxTerm::RadonSquared |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
318 | ), |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
319 | RadonFISTA => AlgorithmConfig::FISTA( |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
320 | FBConfig{ generic : radon_insertion, ..Default::default() }, |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
321 | ProxTerm::RadonSquared |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
322 | ), |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
323 | RadonPDPS => AlgorithmConfig::PDPS( |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
324 | PDPSConfig{ generic : radon_insertion, ..Default::default() }, |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
325 | ProxTerm::RadonSquared |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
326 | ), |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
327 | RadonSlidingFB => AlgorithmConfig::SlidingFB( |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
328 | SlidingFBConfig{ insertion : radon_insertion, ..Default::default() }, |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
329 | ProxTerm::RadonSquared |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
330 | ), |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
331 | RadonSlidingPDPS => AlgorithmConfig::SlidingPDPS( |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
332 | SlidingPDPSConfig{ insertion : radon_insertion, ..Default::default() }, |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
333 | ProxTerm::RadonSquared |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
334 | ), |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
335 | RadonForwardPDPS => AlgorithmConfig::ForwardPDPS( |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
336 | ForwardPDPSConfig{ insertion : radon_insertion, ..Default::default() }, |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
337 | ProxTerm::RadonSquared |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
338 | ), |
| 0 | 339 | } |
| 340 | } | |
| 341 | ||
| 342 | /// Returns the [`Named`] algorithm corresponding to the algorithm shorthand | |
| 343 | pub fn get_named<F : Float>(&self) -> Named<AlgorithmConfig<F>> { | |
| 344 | self.to_named(self.default_config()) | |
| 345 | } | |
| 346 | ||
| 347 | pub fn to_named<F : Float>(self, alg : AlgorithmConfig<F>) -> Named<AlgorithmConfig<F>> { | |
| 348 | let name = self.to_possible_value().unwrap().get_name().to_string(); | |
| 349 | Named{ name , data : alg } | |
| 350 | } | |
| 351 | } | |
| 352 | ||
| 353 | ||
| 354 | // // Floats cannot be hashed directly, so just hash the debug formatting | |
| 355 | // // for use as file identifier. | |
| 356 | // impl<F : Float> Hash for AlgorithmConfig<F> { | |
| 357 | // fn hash<H: Hasher>(&self, state: &mut H) { | |
| 358 | // format!("{:?}", self).hash(state); | |
| 359 | // } | |
| 360 | // } | |
| 361 | ||
| 362 | /// Plotting level configuration | |
| 363 | #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Serialize, ValueEnum, Debug)] | |
| 364 | pub enum PlotLevel { | |
| 365 | /// Plot nothing | |
| 366 | #[clap(name = "none")] | |
| 367 | None, | |
| 368 | /// Plot problem data | |
| 369 | #[clap(name = "data")] | |
| 370 | Data, | |
| 371 | /// Plot iterationwise state | |
| 372 | #[clap(name = "iter")] | |
| 373 | Iter, | |
| 374 | } | |
| 375 | ||
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
376 | impl Default for PlotLevel { |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
377 | fn default() -> Self { |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
378 | Self::Data |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
379 | } |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
380 | } |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
381 | |
| 0 | 382 | type DefaultBT<F, const N : usize> = BT< |
| 383 | DynamicDepth, | |
| 384 | F, | |
| 385 | usize, | |
| 386 | Bounds<F>, | |
| 387 | N | |
| 388 | >; | |
| 389 | type DefaultSeminormOp<F, K, const N : usize> = ConvolutionOp<F, K, DefaultBT<F, N>, N>; | |
| 390 | type DefaultSG<F, Sensor, Spread, const N : usize> = SensorGrid::< | |
| 391 | F, | |
| 392 | Sensor, | |
| 393 | Spread, | |
| 394 | DefaultBT<F, N>, | |
| 395 | N | |
| 396 | >; | |
| 397 | ||
| 398 | /// This is a dirty workaround to rust-csv not supporting struct flattening etc. | |
| 399 | #[derive(Serialize)] | |
| 400 | struct CSVLog<F> { | |
| 401 | iter : usize, | |
| 402 | cpu_time : f64, | |
| 403 | value : F, | |
| 35 | 404 | relative_value : F, |
| 405 | //post_value : F, | |
| 0 | 406 | n_spikes : usize, |
| 407 | inner_iters : usize, | |
| 408 | merged : usize, | |
| 409 | pruned : usize, | |
| 410 | this_iters : usize, | |
| 411 | } | |
| 412 | ||
| 413 | /// Collected experiment statistics | |
| 414 | #[derive(Clone, Debug, Serialize)] | |
| 415 | struct ExperimentStats<F : Float> { | |
| 416 | /// Signal-to-noise ratio in decibels | |
| 417 | ssnr : F, | |
| 418 | /// Proportion of noise in the signal as a number in $[0, 1]$. | |
| 419 | noise_ratio : F, | |
| 420 | /// When the experiment was run (UTC) | |
| 421 | when : DateTime<Utc>, | |
| 422 | } | |
| 423 | ||
| 424 | #[replace_float_literals(F::cast_from(literal))] | |
| 425 | impl<F : Float> ExperimentStats<F> { | |
| 426 | /// Calculate [`ExperimentStats`] based on a noisy `signal` and the separated `noise` signal. | |
| 427 | fn new<E : Euclidean<F>>(signal : &E, noise : &E) -> Self { | |
| 428 | let s = signal.norm2_squared(); | |
| 429 | let n = noise.norm2_squared(); | |
| 430 | let noise_ratio = (n / s).sqrt(); | |
| 431 | let ssnr = 10.0 * (s / n).log10(); | |
| 432 | ExperimentStats { | |
| 433 | ssnr, | |
| 434 | noise_ratio, | |
| 435 | when : Utc::now(), | |
| 436 | } | |
| 437 | } | |
| 438 | } | |
| 439 | /// Collected algorithm statistics | |
| 440 | #[derive(Clone, Debug, Serialize)] | |
| 441 | struct AlgorithmStats<F : Float> { | |
| 442 | /// Overall CPU time spent | |
| 443 | cpu_time : F, | |
| 444 | /// Real time spent | |
| 445 | elapsed : F | |
| 446 | } | |
| 447 | ||
| 448 | ||
| 449 | /// A wrapper for [`serde_json::to_writer_pretty`] that takes a filename as input | |
| 450 | /// and outputs a [`DynError`]. | |
| 451 | fn write_json<T : Serialize>(filename : String, data : &T) -> DynError { | |
| 452 | serde_json::to_writer_pretty(std::fs::File::create(filename)?, data)?; | |
| 453 | Ok(()) | |
| 454 | } | |
| 455 | ||
| 456 | ||
| 457 | /// Struct for experiment configurations | |
| 458 | #[derive(Debug, Clone, Serialize)] | |
|
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
459 | pub struct ExperimentV2<F, NoiseDistr, S, K, P, const N : usize> |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
460 | where F : Float + ClapFloat, |
| 0 | 461 | [usize; N] : Serialize, |
| 462 | NoiseDistr : Distribution<F>, | |
| 463 | S : Sensor<F, N>, | |
| 464 | P : Spread<F, N>, | |
| 465 | K : SimpleConvolutionKernel<F, N>, | |
| 466 | { | |
| 467 | /// Domain $Ω$. | |
| 468 | pub domain : Cube<F, N>, | |
| 469 | /// Number of sensors along each dimension | |
| 470 | pub sensor_count : [usize; N], | |
| 471 | /// Noise distribution | |
| 472 | pub noise_distr : NoiseDistr, | |
| 473 | /// Seed for random noise generation (for repeatable experiments) | |
| 474 | pub noise_seed : u64, | |
| 475 | /// Sensor $θ$; $θ * ψ$ forms the forward operator $𝒜$. | |
| 476 | pub sensor : S, | |
| 477 | /// Spread $ψ$; $θ * ψ$ forms the forward operator $𝒜$. | |
| 478 | pub spread : P, | |
| 479 | /// Kernel $ρ$ of $𝒟$. | |
| 480 | pub kernel : K, | |
| 481 | /// True point sources | |
| 35 | 482 | pub μ_hat : RNDM<F, N>, |
|
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
483 | /// Regularisation term and parameter |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
484 | pub regularisation : Regularisation<F>, |
| 0 | 485 | /// For plotting : how wide should the kernels be plotted |
| 486 | pub kernel_plot_width : F, | |
| 487 | /// Data term | |
| 488 | pub dataterm : DataTerm, | |
| 489 | /// A map of default configurations for algorithms | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
490 | pub algorithm_overrides : HashMap<DefaultAlgorithm, AlgorithmOverrides<F>>, |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
491 | /// Default merge radius |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
492 | pub default_merge_radius : F, |
| 0 | 493 | } |
| 494 | ||
| 35 | 495 | #[derive(Debug, Clone, Serialize)] |
| 496 | pub struct ExperimentBiased<F, NoiseDistr, S, K, P, B, const N : usize> | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
497 | where F : Float + ClapFloat, |
| 35 | 498 | [usize; N] : Serialize, |
| 499 | NoiseDistr : Distribution<F>, | |
| 500 | S : Sensor<F, N>, | |
| 501 | P : Spread<F, N>, | |
| 502 | K : SimpleConvolutionKernel<F, N>, | |
| 503 | B : Mapping<Loc<F, N>, Codomain = F> + Serialize + std::fmt::Debug, | |
| 504 | { | |
| 505 | /// Basic setup | |
| 506 | pub base : ExperimentV2<F, NoiseDistr, S, K, P, N>, | |
| 507 | /// Weight of TV term | |
| 508 | pub λ : F, | |
| 509 | /// Bias function | |
| 510 | pub bias : B, | |
| 511 | } | |
| 512 | ||
| 0 | 513 | /// Trait for runnable experiments |
| 514 | pub trait RunnableExperiment<F : ClapFloat> { | |
|
9
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
515 | /// Run all algorithms provided, or default algorithms if none provided, on the experiment. |
|
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
516 | fn runall(&self, cli : &CommandLineArgs, |
|
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
517 | algs : Option<Vec<Named<AlgorithmConfig<F>>>>) -> DynError; |
| 0 | 518 | |
| 519 | /// Return algorithm default config | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
520 | fn algorithm_overrides(&self, alg : DefaultAlgorithm) -> AlgorithmOverrides<F>; |
| 35 | 521 | } |
| 522 | ||
| 523 | /// Helper function to print experiment start message and save setup. | |
| 524 | /// Returns saving prefix. | |
| 525 | fn start_experiment<E, S>( | |
| 526 | experiment : &Named<E>, | |
| 527 | cli : &CommandLineArgs, | |
| 528 | stats : S, | |
| 529 | ) -> DynResult<String> | |
| 530 | where | |
| 531 | E : Serialize + std::fmt::Debug, | |
| 532 | S : Serialize, | |
| 533 | { | |
| 534 | let Named { name : experiment_name, data } = experiment; | |
| 535 | ||
| 536 | println!("{}\n{}", | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
537 | format!("Performing experiment {}…", experiment_name).cyan(), |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
538 | format!("Experiment settings: {}", serde_json::to_string(&data)?).bright_black()); |
| 35 | 539 | |
| 540 | // Set up output directory | |
| 541 | let prefix = format!("{}/{}/", cli.outdir, experiment_name); | |
| 542 | ||
| 543 | // Save experiment configuration and statistics | |
| 544 | let mkname_e = |t| format!("{prefix}{t}.json", prefix = prefix, t = t); | |
| 545 | std::fs::create_dir_all(&prefix)?; | |
| 546 | write_json(mkname_e("experiment"), experiment)?; | |
| 547 | write_json(mkname_e("config"), cli)?; | |
| 548 | write_json(mkname_e("stats"), &stats)?; | |
| 549 | ||
| 550 | Ok(prefix) | |
| 551 | } | |
| 552 | ||
| 553 | /// Error codes for running an algorithm on an experiment. | |
| 554 | enum RunError { | |
| 555 | /// Algorithm not implemented for this experiment | |
| 556 | NotImplemented, | |
| 0 | 557 | } |
| 558 | ||
| 35 | 559 | use RunError::*; |
| 560 | ||
| 561 | type DoRunAllIt<'a, F, const N : usize> = LoggingIteratorFactory< | |
| 562 | 'a, | |
| 563 | Timed<IterInfo<F, N>>, | |
| 564 | TimingIteratorFactory<BasicAlgIteratorFactory<IterInfo<F, N>>> | |
| 565 | >; | |
| 566 | ||
| 567 | /// Helper function to run all algorithms on an experiment. | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
568 | fn do_runall<F : Float + for<'b> Deserialize<'b>, Z, const N : usize>( |
| 35 | 569 | experiment_name : &String, |
| 570 | prefix : &String, | |
| 571 | cli : &CommandLineArgs, | |
| 572 | algorithms : Vec<Named<AlgorithmConfig<F>>>, | |
| 573 | plotgrid : LinSpace<Loc<F, N>, [usize; N]>, | |
| 574 | mut save_extra : impl FnMut(String, Z) -> DynError, | |
| 575 | mut do_alg : impl FnMut( | |
| 576 | &AlgorithmConfig<F>, | |
| 577 | DoRunAllIt<F, N>, | |
| 578 | SeqPlotter<F, N>, | |
| 579 | String, | |
| 580 | ) -> Result<(RNDM<F, N>, Z), RunError>, | |
| 581 | ) -> DynError | |
| 582 | where | |
| 583 | PlotLookup : Plotting<N>, | |
| 584 | { | |
| 585 | let mut logs = Vec::new(); | |
| 586 | ||
| 587 | let iterator_options = AlgIteratorOptions{ | |
| 588 | max_iter : cli.max_iter, | |
| 589 | verbose_iter : cli.verbose_iter | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
590 | .map_or(Verbose::LogarithmicCap{base : 10, cap : 2}, |
| 35 | 591 | |n| Verbose::Every(n)), |
| 592 | quiet : cli.quiet, | |
| 593 | }; | |
| 594 | ||
| 595 | // Run the algorithm(s) | |
| 596 | for named @ Named { name : alg_name, data : alg } in algorithms.iter() { | |
| 597 | let this_prefix = format!("{}{}/", prefix, alg_name); | |
| 598 | ||
| 599 | // Create Logger and IteratorFactory | |
| 600 | let mut logger = Logger::new(); | |
| 601 | let iterator = iterator_options.instantiate() | |
| 602 | .timed() | |
| 603 | .into_log(&mut logger); | |
| 604 | ||
| 605 | let running = if !cli.quiet { | |
| 606 | format!("{}\n{}\n{}\n", | |
| 607 | format!("Running {} on experiment {}…", alg_name, experiment_name).cyan(), | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
608 | format!("Iteration settings: {}", serde_json::to_string(&iterator_options)?).bright_black(), |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
609 | format!("Algorithm settings: {}", serde_json::to_string(&alg)?).bright_black()) |
| 35 | 610 | } else { |
| 611 | "".to_string() | |
| 612 | }; | |
| 613 | // | |
| 614 | // The following is for postprocessing, which has been disabled anyway. | |
| 615 | // | |
| 616 | // let reg : Box<dyn WeightOptim<_, _, _, N>> = match regularisation { | |
| 617 | // Regularisation::Radon(α) => Box::new(RadonRegTerm(α)), | |
| 618 | // Regularisation::NonnegRadon(α) => Box::new(NonnegRadonRegTerm(α)), | |
| 619 | // }; | |
| 620 | //let findim_data = reg.prepare_optimise_weights(&opA, &b); | |
| 621 | //let inner_config : InnerSettings<F> = Default::default(); | |
| 622 | //let inner_it = inner_config.iterator_options; | |
| 623 | ||
| 624 | // Create plotter and directory if needed. | |
| 625 | let plot_count = if cli.plot >= PlotLevel::Iter { 2000 } else { 0 }; | |
| 626 | let plotter = SeqPlotter::new(this_prefix, plot_count, plotgrid.clone()); | |
| 627 | ||
| 628 | let start = Instant::now(); | |
| 629 | let start_cpu = ProcessTime::now(); | |
| 630 | ||
| 631 | let (μ, z) = match do_alg(alg, iterator, plotter, running) { | |
| 632 | Ok(μ) => μ, | |
| 633 | Err(RunError::NotImplemented) => { | |
| 634 | let msg = format!("Algorithm “{alg_name}” not implemented for {experiment_name}. \ | |
| 635 | Skipping.").red(); | |
| 636 | eprintln!("{}", msg); | |
| 637 | continue | |
| 638 | } | |
| 639 | }; | |
| 640 | ||
| 641 | let elapsed = start.elapsed().as_secs_f64(); | |
| 642 | let cpu_time = start_cpu.elapsed().as_secs_f64(); | |
| 643 | ||
| 644 | println!("{}", format!("Elapsed {elapsed}s (CPU time {cpu_time}s)… ").yellow()); | |
| 645 | ||
| 646 | // Save results | |
| 647 | println!("{}", "Saving results …".green()); | |
| 648 | ||
| 649 | let mkname = |t| format!("{prefix}{alg_name}_{t}"); | |
| 650 | ||
| 651 | write_json(mkname("config.json"), &named)?; | |
| 652 | write_json(mkname("stats.json"), &AlgorithmStats { cpu_time, elapsed })?; | |
| 653 | μ.write_csv(mkname("reco.txt"))?; | |
| 654 | save_extra(mkname(""), z)?; | |
| 655 | //logger.write_csv(mkname("log.txt"))?; | |
| 656 | logs.push((mkname("log.txt"), logger)); | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
657 | } |
| 35 | 658 | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
659 | save_logs(logs, format!("{prefix}valuerange.json"), cli.load_valuerange) |
| 35 | 660 | } |
| 661 | ||
| 662 | #[replace_float_literals(F::cast_from(literal))] | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
663 | impl<F, NoiseDistr, S, K, P, /*PreadjointCodomain, */ const N : usize> RunnableExperiment<F> for |
| 35 | 664 | Named<ExperimentV2<F, NoiseDistr, S, K, P, N>> |
| 665 | where | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
666 | F : ClapFloat + nalgebra::RealField + ToNalgebraRealField<MixedType=F> |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
667 | + Default + for<'b> Deserialize<'b>, |
| 35 | 668 | [usize; N] : Serialize, |
| 669 | S : Sensor<F, N> + Copy + Serialize + std::fmt::Debug, | |
| 670 | P : Spread<F, N> + Copy + Serialize + std::fmt::Debug, | |
| 671 | Convolution<S, P>: Spread<F, N> + Bounded<F> + LocalAnalysis<F, Bounds<F>, N> + Copy | |
| 672 | // TODO: shold not have differentiability as a requirement, but | |
| 673 | // decide availability of sliding based on it. | |
| 674 | //+ for<'b> Differentiable<&'b Loc<F, N>, Output = Loc<F, N>>, | |
| 675 | // TODO: very weird that rust only compiles with Differentiable | |
| 676 | // instead of the above one on references, which is required by | |
| 677 | // poitsource_sliding_fb_reg. | |
| 678 | + DifferentiableRealMapping<F, N> | |
| 679 | + Lipschitz<L2, FloatType=F>, | |
| 680 | for<'b> <Convolution<S, P> as DifferentiableMapping<Loc<F,N>>>::Differential<'b> : Lipschitz<L2, FloatType=F>, // TODO: should not be required generally, only for sliding_fb. | |
| 681 | AutoConvolution<P> : BoundedBy<F, K>, | |
| 682 | K : SimpleConvolutionKernel<F, N> | |
| 683 | + LocalAnalysis<F, Bounds<F>, N> | |
| 684 | + Copy + Serialize + std::fmt::Debug, | |
| 685 | Cube<F, N>: P2Minimise<Loc<F, N>, F> + SetOrd, | |
| 686 | PlotLookup : Plotting<N>, | |
| 687 | DefaultBT<F, N> : SensorGridBT<F, S, P, N, Depth=DynamicDepth> + BTSearch<F, N>, | |
| 688 | BTNodeLookup: BTNode<F, usize, Bounds<F>, N>, | |
| 689 | RNDM<F, N> : SpikeMerging<F>, | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
690 | NoiseDistr : Distribution<F> + Serialize + std::fmt::Debug, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
691 | // DefaultSG<F, S, P, N> : ForwardModel<RNDM<F, N>, F, PreadjointCodomain = PreadjointCodomain, Observable=DVector<F::MixedType>>, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
692 | // PreadjointCodomain : Space + Bounded<F> + DifferentiableRealMapping<F, N>, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
693 | // DefaultSeminormOp<F, K, N> : ProxPenalty<F, PreadjointCodomain, RadonRegTerm<F>, N>, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
694 | // DefaultSeminormOp<F, K, N> : ProxPenalty<F, PreadjointCodomain, NonnegRadonRegTerm<F>, N>, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
695 | // RadonSquared : ProxPenalty<F, PreadjointCodomain, RadonRegTerm<F>, N>, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
696 | // RadonSquared : ProxPenalty<F, PreadjointCodomain, NonnegRadonRegTerm<F>, N>, |
| 35 | 697 | { |
| 0 | 698 | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
699 | fn algorithm_overrides(&self, alg : DefaultAlgorithm) -> AlgorithmOverrides<F> { |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
700 | AlgorithmOverrides { |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
701 | merge_radius : Some(self.data.default_merge_radius), |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
702 | .. self.data.algorithm_overrides.get(&alg).cloned().unwrap_or(Default::default()) |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
703 | } |
| 0 | 704 | } |
| 705 | ||
|
9
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
706 | fn runall(&self, cli : &CommandLineArgs, |
|
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
707 | algs : Option<Vec<Named<AlgorithmConfig<F>>>>) -> DynError { |
|
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
708 | // Get experiment configuration |
| 0 | 709 | let &Named { |
| 710 | name : ref experiment_name, | |
| 35 | 711 | data : ExperimentV2 { |
| 0 | 712 | domain, sensor_count, ref noise_distr, sensor, spread, kernel, |
| 35 | 713 | ref μ_hat, regularisation, kernel_plot_width, dataterm, noise_seed, |
| 0 | 714 | .. |
| 715 | } | |
| 716 | } = self; | |
|
9
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
717 | |
|
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
718 | // Set up algorithms |
| 35 | 719 | let algorithms = match (algs, dataterm) { |
|
9
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
720 | (Some(algs), _) => algs, |
|
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
721 | (None, DataTerm::L2Squared) => vec![DefaultAlgorithm::FB.get_named()], |
|
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
722 | (None, DataTerm::L1) => vec![DefaultAlgorithm::PDPS.get_named()], |
|
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
723 | }; |
| 0 | 724 | |
| 725 | // Set up operators | |
|
9
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
726 | let depth = DynamicDepth(8); |
| 0 | 727 | let opA = DefaultSG::new(domain, sensor_count, sensor, spread, depth); |
| 728 | let op𝒟 = DefaultSeminormOp::new(depth, domain, kernel); | |
| 729 | ||
| 730 | // Set up random number generator. | |
| 731 | let mut rng = StdRng::seed_from_u64(noise_seed); | |
| 732 | ||
| 733 | // Generate the data and calculate SSNR statistic | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
734 | let b_hat = opA.apply(μ_hat); |
| 0 | 735 | let noise = DVector::from_distribution(b_hat.len(), &noise_distr, &mut rng); |
| 736 | let b = &b_hat + &noise; | |
| 737 | // Need to wrap calc_ssnr into a function to hide ultra-lame nalgebra::RealField | |
| 738 | // overloading log10 and conflicting with standard NumTraits one. | |
| 739 | let stats = ExperimentStats::new(&b, &noise); | |
| 740 | ||
| 35 | 741 | let prefix = start_experiment(&self, cli, stats)?; |
| 0 | 742 | |
|
9
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
743 | plotall(cli, &prefix, &domain, &sensor, &kernel, &spread, |
| 0 | 744 | &μ_hat, &op𝒟, &opA, &b_hat, &b, kernel_plot_width)?; |
| 745 | ||
| 35 | 746 | let plotgrid = lingrid(&domain, &[if N==1 { 1000 } else { 100 }; N]); |
| 747 | ||
| 748 | let save_extra = |_, ()| Ok(()); | |
| 0 | 749 | |
| 35 | 750 | do_runall(experiment_name, &prefix, cli, algorithms, plotgrid, save_extra, |
| 751 | |alg, iterator, plotter, running| | |
| 752 | { | |
|
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
753 | let μ = match alg { |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
754 | AlgorithmConfig::FB(ref algconfig, prox) => { |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
755 | match (regularisation, dataterm, prox) { |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
756 | (Regularisation::NonnegRadon(α), DataTerm::L2Squared, ProxTerm::Wave) => Ok({ |
| 35 | 757 | print!("{running}"); |
|
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
758 | pointsource_fb_reg( |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
759 | &opA, &b, NonnegRadonRegTerm(α), &op𝒟, algconfig, |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
760 | iterator, plotter |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
761 | ) |
| 35 | 762 | }), |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
763 | (Regularisation::Radon(α), DataTerm::L2Squared, ProxTerm::Wave) => Ok({ |
| 35 | 764 | print!("{running}"); |
|
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
765 | pointsource_fb_reg( |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
766 | &opA, &b, RadonRegTerm(α), &op𝒟, algconfig, |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
767 | iterator, plotter |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
768 | ) |
| 35 | 769 | }), |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
770 | (Regularisation::NonnegRadon(α), DataTerm::L2Squared, ProxTerm::RadonSquared) => Ok({ |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
771 | print!("{running}"); |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
772 | pointsource_fb_reg( |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
773 | &opA, &b, NonnegRadonRegTerm(α), &RadonSquared, algconfig, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
774 | iterator, plotter |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
775 | ) |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
776 | }), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
777 | (Regularisation::Radon(α), DataTerm::L2Squared, ProxTerm::RadonSquared) => Ok({ |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
778 | print!("{running}"); |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
779 | pointsource_fb_reg( |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
780 | &opA, &b, RadonRegTerm(α), &RadonSquared, algconfig, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
781 | iterator, plotter |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
782 | ) |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
783 | }), |
| 35 | 784 | _ => Err(NotImplemented) |
|
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
785 | } |
| 0 | 786 | }, |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
787 | AlgorithmConfig::FISTA(ref algconfig, prox) => { |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
788 | match (regularisation, dataterm, prox) { |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
789 | (Regularisation::NonnegRadon(α), DataTerm::L2Squared, ProxTerm::Wave) => Ok({ |
| 35 | 790 | print!("{running}"); |
| 32 | 791 | pointsource_fista_reg( |
| 792 | &opA, &b, NonnegRadonRegTerm(α), &op𝒟, algconfig, | |
| 793 | iterator, plotter | |
| 794 | ) | |
| 35 | 795 | }), |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
796 | (Regularisation::Radon(α), DataTerm::L2Squared, ProxTerm::Wave) => Ok({ |
| 35 | 797 | print!("{running}"); |
| 32 | 798 | pointsource_fista_reg( |
| 799 | &opA, &b, RadonRegTerm(α), &op𝒟, algconfig, | |
| 800 | iterator, plotter | |
| 801 | ) | |
| 35 | 802 | }), |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
803 | (Regularisation::NonnegRadon(α), DataTerm::L2Squared, ProxTerm::RadonSquared) => Ok({ |
| 35 | 804 | print!("{running}"); |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
805 | pointsource_fista_reg( |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
806 | &opA, &b, NonnegRadonRegTerm(α), &RadonSquared, algconfig, |
|
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
807 | iterator, plotter |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
808 | ) |
| 35 | 809 | }), |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
810 | (Regularisation::Radon(α), DataTerm::L2Squared, ProxTerm::RadonSquared) => Ok({ |
| 35 | 811 | print!("{running}"); |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
812 | pointsource_fista_reg( |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
813 | &opA, &b, RadonRegTerm(α), &RadonSquared, algconfig, |
|
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
814 | iterator, plotter |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
815 | ) |
| 35 | 816 | }), |
| 817 | _ => Err(NotImplemented), | |
|
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
818 | } |
|
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
819 | }, |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
820 | AlgorithmConfig::SlidingFB(ref algconfig, prox) => { |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
821 | match (regularisation, dataterm, prox) { |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
822 | (Regularisation::NonnegRadon(α), DataTerm::L2Squared, ProxTerm::Wave) => Ok({ |
| 35 | 823 | print!("{running}"); |
| 32 | 824 | pointsource_sliding_fb_reg( |
| 825 | &opA, &b, NonnegRadonRegTerm(α), &op𝒟, algconfig, | |
| 826 | iterator, plotter | |
| 827 | ) | |
| 35 | 828 | }), |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
829 | (Regularisation::Radon(α), DataTerm::L2Squared, ProxTerm::Wave) => Ok({ |
| 35 | 830 | print!("{running}"); |
| 32 | 831 | pointsource_sliding_fb_reg( |
| 832 | &opA, &b, RadonRegTerm(α), &op𝒟, algconfig, | |
| 833 | iterator, plotter | |
| 834 | ) | |
| 35 | 835 | }), |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
836 | (Regularisation::NonnegRadon(α), DataTerm::L2Squared, ProxTerm::RadonSquared) => Ok({ |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
837 | print!("{running}"); |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
838 | pointsource_sliding_fb_reg( |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
839 | &opA, &b, NonnegRadonRegTerm(α), &RadonSquared, algconfig, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
840 | iterator, plotter |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
841 | ) |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
842 | }), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
843 | (Regularisation::Radon(α), DataTerm::L2Squared, ProxTerm::RadonSquared) => Ok({ |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
844 | print!("{running}"); |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
845 | pointsource_sliding_fb_reg( |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
846 | &opA, &b, RadonRegTerm(α), &RadonSquared, algconfig, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
847 | iterator, plotter |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
848 | ) |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
849 | }), |
| 35 | 850 | _ => Err(NotImplemented), |
| 32 | 851 | } |
| 852 | }, | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
853 | AlgorithmConfig::PDPS(ref algconfig, prox) => { |
| 35 | 854 | print!("{running}"); |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
855 | match (regularisation, dataterm, prox) { |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
856 | (Regularisation::NonnegRadon(α), DataTerm::L2Squared, ProxTerm::Wave) => Ok({ |
|
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
857 | pointsource_pdps_reg( |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
858 | &opA, &b, NonnegRadonRegTerm(α), &op𝒟, algconfig, |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
859 | iterator, plotter, L2Squared |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
860 | ) |
| 35 | 861 | }), |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
862 | (Regularisation::Radon(α),DataTerm::L2Squared, ProxTerm::Wave) => Ok({ |
|
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
863 | pointsource_pdps_reg( |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
864 | &opA, &b, RadonRegTerm(α), &op𝒟, algconfig, |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
865 | iterator, plotter, L2Squared |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
866 | ) |
| 35 | 867 | }), |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
868 | (Regularisation::NonnegRadon(α), DataTerm::L1, ProxTerm::Wave) => Ok({ |
|
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
869 | pointsource_pdps_reg( |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
870 | &opA, &b, NonnegRadonRegTerm(α), &op𝒟, algconfig, |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
871 | iterator, plotter, L1 |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
872 | ) |
| 35 | 873 | }), |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
874 | (Regularisation::Radon(α), DataTerm::L1, ProxTerm::Wave) => Ok({ |
|
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
875 | pointsource_pdps_reg( |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
876 | &opA, &b, RadonRegTerm(α), &op𝒟, algconfig, |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
877 | iterator, plotter, L1 |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
878 | ) |
| 35 | 879 | }), |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
880 | (Regularisation::NonnegRadon(α), DataTerm::L2Squared, ProxTerm::RadonSquared) => Ok({ |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
881 | pointsource_pdps_reg( |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
882 | &opA, &b, NonnegRadonRegTerm(α), &RadonSquared, algconfig, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
883 | iterator, plotter, L2Squared |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
884 | ) |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
885 | }), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
886 | (Regularisation::Radon(α),DataTerm::L2Squared, ProxTerm::RadonSquared) => Ok({ |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
887 | pointsource_pdps_reg( |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
888 | &opA, &b, RadonRegTerm(α), &RadonSquared, algconfig, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
889 | iterator, plotter, L2Squared |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
890 | ) |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
891 | }), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
892 | (Regularisation::NonnegRadon(α), DataTerm::L1, ProxTerm::RadonSquared) => Ok({ |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
893 | pointsource_pdps_reg( |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
894 | &opA, &b, NonnegRadonRegTerm(α), &RadonSquared, algconfig, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
895 | iterator, plotter, L1 |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
896 | ) |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
897 | }), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
898 | (Regularisation::Radon(α), DataTerm::L1, ProxTerm::RadonSquared) => Ok({ |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
899 | pointsource_pdps_reg( |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
900 | &opA, &b, RadonRegTerm(α), &RadonSquared, algconfig, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
901 | iterator, plotter, L1 |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
902 | ) |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
903 | }), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
904 | // _ => Err(NotImplemented), |
|
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
905 | } |
| 0 | 906 | }, |
|
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
907 | AlgorithmConfig::FW(ref algconfig) => { |
|
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
908 | match (regularisation, dataterm) { |
| 35 | 909 | (Regularisation::Radon(α), DataTerm::L2Squared) => Ok({ |
| 910 | print!("{running}"); | |
|
25
79943be70720
Implement non-negativity constraints for the conditional gradient methods
Tuomo Valkonen <tuomov@iki.fi>
parents:
24
diff
changeset
|
911 | pointsource_fw_reg(&opA, &b, RadonRegTerm(α), |
|
79943be70720
Implement non-negativity constraints for the conditional gradient methods
Tuomo Valkonen <tuomov@iki.fi>
parents:
24
diff
changeset
|
912 | algconfig, iterator, plotter) |
| 35 | 913 | }), |
| 914 | (Regularisation::NonnegRadon(α), DataTerm::L2Squared) => Ok({ | |
| 915 | print!("{running}"); | |
|
25
79943be70720
Implement non-negativity constraints for the conditional gradient methods
Tuomo Valkonen <tuomov@iki.fi>
parents:
24
diff
changeset
|
916 | pointsource_fw_reg(&opA, &b, NonnegRadonRegTerm(α), |
|
79943be70720
Implement non-negativity constraints for the conditional gradient methods
Tuomo Valkonen <tuomov@iki.fi>
parents:
24
diff
changeset
|
917 | algconfig, iterator, plotter) |
| 35 | 918 | }), |
| 919 | _ => Err(NotImplemented), | |
|
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
920 | } |
| 35 | 921 | }, |
| 922 | _ => Err(NotImplemented), | |
| 923 | }?; | |
| 924 | Ok((μ, ())) | |
| 925 | }) | |
| 0 | 926 | } |
| 927 | } | |
| 35 | 928 | |
| 929 | ||
| 930 | #[replace_float_literals(F::cast_from(literal))] | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
931 | impl<F, NoiseDistr, S, K, P, B, /*PreadjointCodomain,*/ const N : usize> RunnableExperiment<F> for |
| 35 | 932 | Named<ExperimentBiased<F, NoiseDistr, S, K, P, B, N>> |
| 933 | where | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
934 | F : ClapFloat + nalgebra::RealField + ToNalgebraRealField<MixedType=F> |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
935 | + Default + for<'b> Deserialize<'b>, |
| 35 | 936 | [usize; N] : Serialize, |
| 937 | S : Sensor<F, N> + Copy + Serialize + std::fmt::Debug, | |
| 938 | P : Spread<F, N> + Copy + Serialize + std::fmt::Debug, | |
| 939 | Convolution<S, P>: Spread<F, N> + Bounded<F> + LocalAnalysis<F, Bounds<F>, N> + Copy | |
| 940 | // TODO: shold not have differentiability as a requirement, but | |
| 941 | // decide availability of sliding based on it. | |
| 942 | //+ for<'b> Differentiable<&'b Loc<F, N>, Output = Loc<F, N>>, | |
| 943 | // TODO: very weird that rust only compiles with Differentiable | |
| 944 | // instead of the above one on references, which is required by | |
| 945 | // poitsource_sliding_fb_reg. | |
| 946 | + DifferentiableRealMapping<F, N> | |
| 947 | + Lipschitz<L2, FloatType=F>, | |
| 948 | for<'b> <Convolution<S, P> as DifferentiableMapping<Loc<F,N>>>::Differential<'b> : Lipschitz<L2, FloatType=F>, // TODO: should not be required generally, only for sliding_fb. | |
| 949 | AutoConvolution<P> : BoundedBy<F, K>, | |
| 950 | K : SimpleConvolutionKernel<F, N> | |
| 951 | + LocalAnalysis<F, Bounds<F>, N> | |
| 952 | + Copy + Serialize + std::fmt::Debug, | |
| 953 | Cube<F, N>: P2Minimise<Loc<F, N>, F> + SetOrd, | |
| 954 | PlotLookup : Plotting<N>, | |
| 955 | DefaultBT<F, N> : SensorGridBT<F, S, P, N, Depth=DynamicDepth> + BTSearch<F, N>, | |
| 956 | BTNodeLookup: BTNode<F, usize, Bounds<F>, N>, | |
| 957 | RNDM<F, N> : SpikeMerging<F>, | |
| 958 | NoiseDistr : Distribution<F> + Serialize + std::fmt::Debug, | |
| 959 | B : Mapping<Loc<F, N>, Codomain = F> + Serialize + std::fmt::Debug, | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
960 | // DefaultSG<F, S, P, N> : ForwardModel<RNDM<F, N>, F, PreadjointCodomain = PreadjointCodomain, Observable=DVector<F::MixedType>>, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
961 | // PreadjointCodomain : Bounded<F> + DifferentiableRealMapping<F, N>, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
962 | // DefaultSeminormOp<F, K, N> : ProxPenalty<F, PreadjointCodomain, RadonRegTerm<F>, N>, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
963 | // DefaultSeminormOp<F, K, N> : ProxPenalty<F, PreadjointCodomain, NonnegRadonRegTerm<F>, N>, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
964 | // RadonSquared : ProxPenalty<F, PreadjointCodomain, RadonRegTerm<F>, N>, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
965 | // RadonSquared : ProxPenalty<F, PreadjointCodomain, NonnegRadonRegTerm<F>, N>, |
| 35 | 966 | { |
| 967 | ||
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
968 | fn algorithm_overrides(&self, alg : DefaultAlgorithm) -> AlgorithmOverrides<F> { |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
969 | AlgorithmOverrides { |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
970 | merge_radius : Some(self.data.base.default_merge_radius), |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
971 | .. self.data.base.algorithm_overrides.get(&alg).cloned().unwrap_or(Default::default()) |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
972 | } |
| 35 | 973 | } |
| 974 | ||
| 975 | fn runall(&self, cli : &CommandLineArgs, | |
| 976 | algs : Option<Vec<Named<AlgorithmConfig<F>>>>) -> DynError { | |
| 977 | // Get experiment configuration | |
| 978 | let &Named { | |
| 979 | name : ref experiment_name, | |
| 980 | data : ExperimentBiased { | |
| 981 | λ, | |
| 982 | ref bias, | |
| 983 | base : ExperimentV2 { | |
| 984 | domain, sensor_count, ref noise_distr, sensor, spread, kernel, | |
| 985 | ref μ_hat, regularisation, kernel_plot_width, dataterm, noise_seed, | |
| 986 | .. | |
| 987 | } | |
| 988 | } | |
| 989 | } = self; | |
| 990 | ||
| 991 | // Set up algorithms | |
| 992 | let algorithms = match (algs, dataterm) { | |
| 993 | (Some(algs), _) => algs, | |
| 994 | _ => vec![DefaultAlgorithm::SlidingPDPS.get_named()], | |
| 995 | }; | |
| 996 | ||
| 997 | // Set up operators | |
| 998 | let depth = DynamicDepth(8); | |
| 999 | let opA = DefaultSG::new(domain, sensor_count, sensor, spread, depth); | |
| 1000 | let op𝒟 = DefaultSeminormOp::new(depth, domain, kernel); | |
| 1001 | let opAext = RowOp(opA.clone(), IdOp::new()); | |
| 1002 | let fnR = Zero::new(); | |
| 1003 | let h = map3(domain.span_start(), domain.span_end(), sensor_count, | |
| 1004 | |a, b, n| (b-a)/F::cast_from(n)) | |
| 1005 | .into_iter() | |
| 1006 | .reduce(NumTraitsFloat::max) | |
| 1007 | .unwrap(); | |
| 1008 | let z = DVector::zeros(sensor_count.iter().product()); | |
| 1009 | let opKz = Grad::new_for(&z, h, sensor_count, ForwardNeumann).unwrap(); | |
| 1010 | let y = opKz.apply(&z); | |
| 1011 | let fnH = Weighted{ base_fn : L1.as_mapping(), weight : λ}; // TODO: L_{2,1} | |
| 1012 | // let zero_y = y.clone(); | |
| 1013 | // let zeroBTFN = opA.preadjoint().apply(&zero_y); | |
| 1014 | // let opKμ = ZeroOp::new(&zero_y, zeroBTFN); | |
| 1015 | ||
| 1016 | // Set up random number generator. | |
| 1017 | let mut rng = StdRng::seed_from_u64(noise_seed); | |
| 1018 | ||
| 1019 | // Generate the data and calculate SSNR statistic | |
| 1020 | let bias_vec = DVector::from_vec(opA.grid() | |
| 1021 | .into_iter() | |
| 1022 | .map(|v| bias.apply(v)) | |
| 1023 | .collect::<Vec<F>>()); | |
| 1024 | let b_hat : DVector<_> = opA.apply(μ_hat) + &bias_vec; | |
| 1025 | let noise = DVector::from_distribution(b_hat.len(), &noise_distr, &mut rng); | |
| 1026 | let b = &b_hat + &noise; | |
| 1027 | // Need to wrap calc_ssnr into a function to hide ultra-lame nalgebra::RealField | |
| 1028 | // overloading log10 and conflicting with standard NumTraits one. | |
| 1029 | let stats = ExperimentStats::new(&b, &noise); | |
| 1030 | ||
| 1031 | let prefix = start_experiment(&self, cli, stats)?; | |
| 1032 | ||
| 1033 | plotall(cli, &prefix, &domain, &sensor, &kernel, &spread, | |
| 1034 | &μ_hat, &op𝒟, &opA, &b_hat, &b, kernel_plot_width)?; | |
| 1035 | ||
| 1036 | opA.write_observable(&bias_vec, format!("{prefix}bias"))?; | |
| 1037 | ||
| 1038 | let plotgrid = lingrid(&domain, &[if N==1 { 1000 } else { 100 }; N]); | |
| 1039 | ||
| 1040 | let save_extra = |prefix, z| opA.write_observable(&z, format!("{prefix}z")); | |
|
24
d29d1fcf5423
Support arbitrary regularisation terms; implement non-positivity-constrained regularisation.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
1041 | |
| 35 | 1042 | // Run the algorithms |
| 1043 | do_runall(experiment_name, &prefix, cli, algorithms, plotgrid, save_extra, | |
| 1044 | |alg, iterator, plotter, running| | |
| 1045 | { | |
| 1046 | let Pair(μ, z) = match alg { | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1047 | AlgorithmConfig::ForwardPDPS(ref algconfig, prox) => { |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1048 | match (regularisation, dataterm, prox) { |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1049 | (Regularisation::NonnegRadon(α), DataTerm::L2Squared, ProxTerm::Wave) => Ok({ |
| 35 | 1050 | print!("{running}"); |
| 1051 | pointsource_forward_pdps_pair( | |
| 1052 | &opAext, &b, NonnegRadonRegTerm(α), &op𝒟, algconfig, | |
| 1053 | iterator, plotter, | |
| 1054 | /* opKμ, */ &opKz, &fnR, &fnH, z.clone(), y.clone(), | |
| 1055 | ) | |
| 1056 | }), | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1057 | (Regularisation::Radon(α), DataTerm::L2Squared, ProxTerm::Wave) => Ok({ |
| 35 | 1058 | print!("{running}"); |
| 1059 | pointsource_forward_pdps_pair( | |
| 1060 | &opAext, &b, RadonRegTerm(α), &op𝒟, algconfig, | |
| 1061 | iterator, plotter, | |
| 1062 | /* opKμ, */ &opKz, &fnR, &fnH, z.clone(), y.clone(), | |
| 1063 | ) | |
| 1064 | }), | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1065 | (Regularisation::NonnegRadon(α), DataTerm::L2Squared, ProxTerm::RadonSquared) => Ok({ |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1066 | print!("{running}"); |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1067 | pointsource_forward_pdps_pair( |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1068 | &opAext, &b, NonnegRadonRegTerm(α), &RadonSquared, algconfig, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1069 | iterator, plotter, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1070 | /* opKμ, */ &opKz, &fnR, &fnH, z.clone(), y.clone(), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1071 | ) |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1072 | }), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1073 | (Regularisation::Radon(α), DataTerm::L2Squared, ProxTerm::RadonSquared) => Ok({ |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1074 | print!("{running}"); |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1075 | pointsource_forward_pdps_pair( |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1076 | &opAext, &b, RadonRegTerm(α), &RadonSquared, algconfig, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1077 | iterator, plotter, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1078 | /* opKμ, */ &opKz, &fnR, &fnH, z.clone(), y.clone(), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1079 | ) |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1080 | }), |
| 35 | 1081 | _ => Err(NotImplemented) |
| 1082 | } | |
| 1083 | }, | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1084 | AlgorithmConfig::SlidingPDPS(ref algconfig, prox) => { |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1085 | match (regularisation, dataterm, prox) { |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1086 | (Regularisation::NonnegRadon(α), DataTerm::L2Squared, ProxTerm::Wave) => Ok({ |
| 35 | 1087 | print!("{running}"); |
| 1088 | pointsource_sliding_pdps_pair( | |
| 1089 | &opAext, &b, NonnegRadonRegTerm(α), &op𝒟, algconfig, | |
| 1090 | iterator, plotter, | |
| 1091 | /* opKμ, */ &opKz, &fnR, &fnH, z.clone(), y.clone(), | |
| 1092 | ) | |
| 1093 | }), | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1094 | (Regularisation::Radon(α), DataTerm::L2Squared, ProxTerm::Wave) => Ok({ |
| 35 | 1095 | print!("{running}"); |
| 1096 | pointsource_sliding_pdps_pair( | |
| 1097 | &opAext, &b, RadonRegTerm(α), &op𝒟, algconfig, | |
| 1098 | iterator, plotter, | |
| 1099 | /* opKμ, */ &opKz, &fnR, &fnH, z.clone(), y.clone(), | |
| 1100 | ) | |
| 1101 | }), | |
|
37
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1102 | (Regularisation::NonnegRadon(α), DataTerm::L2Squared, ProxTerm::RadonSquared) => Ok({ |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1103 | print!("{running}"); |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1104 | pointsource_sliding_pdps_pair( |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1105 | &opAext, &b, NonnegRadonRegTerm(α), &RadonSquared, algconfig, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1106 | iterator, plotter, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1107 | /* opKμ, */ &opKz, &fnR, &fnH, z.clone(), y.clone(), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1108 | ) |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1109 | }), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1110 | (Regularisation::Radon(α), DataTerm::L2Squared, ProxTerm::RadonSquared) => Ok({ |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1111 | print!("{running}"); |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1112 | pointsource_sliding_pdps_pair( |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1113 | &opAext, &b, RadonRegTerm(α), &RadonSquared, algconfig, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1114 | iterator, plotter, |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1115 | /* opKμ, */ &opKz, &fnR, &fnH, z.clone(), y.clone(), |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1116 | ) |
|
c5d8bd1a7728
Generic proximal penalty support
Tuomo Valkonen <tuomov@iki.fi>
parents:
35
diff
changeset
|
1117 | }), |
| 35 | 1118 | _ => Err(NotImplemented) |
| 1119 | } | |
| 1120 | }, | |
| 1121 | _ => Err(NotImplemented) | |
| 1122 | }?; | |
| 1123 | Ok((μ, z)) | |
| 1124 | }) | |
| 1125 | } | |
| 1126 | } | |
| 1127 | ||
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1128 | #[derive(Copy, Clone, Debug, Serialize, Deserialize)] |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1129 | struct ValueRange<F : Float> { |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1130 | ini : F, |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1131 | min : F, |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1132 | } |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1133 | |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1134 | impl<F : Float> ValueRange<F> { |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1135 | fn expand_with(self, other : Self) -> Self { |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1136 | ValueRange { |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1137 | ini : self.ini.max(other.ini), |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1138 | min : self.min.min(other.min), |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1139 | } |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1140 | } |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1141 | } |
| 35 | 1142 | |
| 1143 | /// Calculative minimum and maximum values of all the `logs`, and save them into | |
| 1144 | /// corresponding file names given as the first elements of the tuples in the vectors. | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1145 | fn save_logs<F : Float + for<'b> Deserialize<'b>, const N : usize>( |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1146 | logs : Vec<(String, Logger<Timed<IterInfo<F, N>>>)>, |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1147 | valuerange_file : String, |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1148 | load_valuerange : bool, |
| 35 | 1149 | ) -> DynError { |
| 1150 | // Process logs for relative values | |
| 1151 | println!("{}", "Processing logs…"); | |
| 1152 | ||
| 1153 | // Find minimum value and initial value within a single log | |
| 1154 | let proc_single_log = |log : &Logger<Timed<IterInfo<F, N>>>| { | |
| 1155 | let d = log.data(); | |
| 1156 | let mi = d.iter() | |
| 1157 | .map(|i| i.data.value) | |
| 1158 | .reduce(NumTraitsFloat::min); | |
| 1159 | d.first() | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1160 | .map(|i| i.data.value) |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1161 | .zip(mi) |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1162 | .map(|(ini, min)| ValueRange{ ini, min }) |
| 35 | 1163 | }; |
| 1164 | ||
| 1165 | // Find minimum and maximum value over all logs | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1166 | let mut v = logs.iter() |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1167 | .filter_map(|&(_, ref log)| proc_single_log(log)) |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1168 | .reduce(|v1, v2| v1.expand_with(v2)) |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1169 | .ok_or(anyhow!("No algorithms found"))?; |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1170 | |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1171 | // Load existing range |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1172 | if load_valuerange && std::fs::metadata(&valuerange_file).is_ok() { |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1173 | let data = std::fs::read_to_string(&valuerange_file)?; |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1174 | v = v.expand_with(serde_json::from_str(&data)?); |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1175 | } |
| 35 | 1176 | |
| 1177 | let logmap = |Timed { cpu_time, iter, data }| { | |
| 1178 | let IterInfo { | |
| 1179 | value, | |
| 1180 | n_spikes, | |
| 1181 | inner_iters, | |
| 1182 | merged, | |
| 1183 | pruned, | |
| 1184 | //postprocessing, | |
| 1185 | this_iters, | |
| 1186 | .. | |
| 1187 | } = data; | |
| 1188 | // let post_value = match (postprocessing, dataterm) { | |
| 1189 | // (Some(mut μ), DataTerm::L2Squared) => { | |
| 1190 | // // Comparison postprocessing is only implemented for the case handled | |
| 1191 | // // by the FW variants. | |
| 1192 | // reg.optimise_weights( | |
| 1193 | // &mut μ, &opA, &b, &findim_data, &inner_config, | |
| 1194 | // inner_it | |
| 1195 | // ); | |
| 1196 | // dataterm.value_at_residual(opA.apply(&μ) - &b) | |
| 1197 | // + regularisation.apply(&μ) | |
| 1198 | // }, | |
| 1199 | // _ => value, | |
| 1200 | // }; | |
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1201 | let relative_value = (value - v.min)/(v.ini - v.min); |
| 35 | 1202 | CSVLog { |
| 1203 | iter, | |
| 1204 | value, | |
| 1205 | relative_value, | |
| 1206 | //post_value, | |
| 1207 | n_spikes, | |
| 1208 | cpu_time : cpu_time.as_secs_f64(), | |
| 1209 | inner_iters, | |
| 1210 | merged, | |
| 1211 | pruned, | |
| 1212 | this_iters | |
| 1213 | } | |
| 1214 | }; | |
| 1215 | ||
| 1216 | println!("{}", "Saving logs …".green()); | |
| 1217 | ||
|
39
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1218 | serde_json::to_writer_pretty(std::fs::File::create(&valuerange_file)?, &v)?; |
|
6316d68b58af
Merging adjustments, parameter tuning, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
37
diff
changeset
|
1219 | |
| 35 | 1220 | for (name, logger) in logs { |
| 1221 | logger.map(logmap).write_csv(name)?; | |
| 1222 | } | |
| 1223 | ||
| 1224 | Ok(()) | |
| 1225 | } | |
| 1226 | ||
| 0 | 1227 | |
| 1228 | /// Plot experiment setup | |
| 1229 | #[replace_float_literals(F::cast_from(literal))] | |
| 1230 | fn plotall<F, Sensor, Kernel, Spread, 𝒟, A, const N : usize>( | |
|
9
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
1231 | cli : &CommandLineArgs, |
| 0 | 1232 | prefix : &String, |
| 1233 | domain : &Cube<F, N>, | |
| 1234 | sensor : &Sensor, | |
| 1235 | kernel : &Kernel, | |
| 1236 | spread : &Spread, | |
| 35 | 1237 | μ_hat : &RNDM<F, N>, |
| 0 | 1238 | op𝒟 : &𝒟, |
| 1239 | opA : &A, | |
| 1240 | b_hat : &A::Observable, | |
| 1241 | b : &A::Observable, | |
| 1242 | kernel_plot_width : F, | |
| 1243 | ) -> DynError | |
| 1244 | where F : Float + ToNalgebraRealField, | |
| 1245 | Sensor : RealMapping<F, N> + Support<F, N> + Clone, | |
| 1246 | Spread : RealMapping<F, N> + Support<F, N> + Clone, | |
| 1247 | Kernel : RealMapping<F, N> + Support<F, N>, | |
|
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
1248 | Convolution<Sensor, Spread> : DifferentiableRealMapping<F, N> + Support<F, N>, |
| 0 | 1249 | 𝒟 : DiscreteMeasureOp<Loc<F, N>, F>, |
| 1250 | 𝒟::Codomain : RealMapping<F, N>, | |
| 35 | 1251 | A : ForwardModel<RNDM<F, N>, F>, |
| 1252 | for<'a> &'a A::Observable : Instance<A::Observable>, | |
|
34
efa60bc4f743
Radon FB + sliding improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
1253 | A::PreadjointCodomain : DifferentiableRealMapping<F, N> + Bounded<F>, |
| 0 | 1254 | PlotLookup : Plotting<N>, |
| 1255 | Cube<F, N> : SetOrd { | |
| 1256 | ||
|
9
21b0e537ac0e
Command line parameter passing simplifications and make `-o` required.
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
1257 | if cli.plot < PlotLevel::Data { |
| 0 | 1258 | return Ok(()) |
| 1259 | } | |
| 1260 | ||
| 1261 | let base = Convolution(sensor.clone(), spread.clone()); | |
| 1262 | ||
| 1263 | let resolution = if N==1 { 100 } else { 40 }; | |
| 35 | 1264 | let pfx = |n| format!("{prefix}{n}"); |
| 0 | 1265 | let plotgrid = lingrid(&[[-kernel_plot_width, kernel_plot_width]; N].into(), &[resolution; N]); |
| 1266 | ||
| 35 | 1267 | PlotLookup::plot_into_file(sensor, plotgrid, pfx("sensor")); |
| 1268 | PlotLookup::plot_into_file(kernel, plotgrid, pfx("kernel")); | |
| 1269 | PlotLookup::plot_into_file(spread, plotgrid, pfx("spread")); | |
| 1270 | PlotLookup::plot_into_file(&base, plotgrid, pfx("base_sensor")); | |
| 0 | 1271 | |
| 1272 | let plotgrid2 = lingrid(&domain, &[resolution; N]); | |
| 1273 | ||
| 1274 | let ω_hat = op𝒟.apply(μ_hat); | |
| 1275 | let noise = opA.preadjoint().apply(opA.apply(μ_hat) - b); | |
| 35 | 1276 | PlotLookup::plot_into_file(&ω_hat, plotgrid2, pfx("omega_hat")); |
| 1277 | PlotLookup::plot_into_file(&noise, plotgrid2, pfx("omega_noise")); | |
| 0 | 1278 | |
| 1279 | let preadj_b = opA.preadjoint().apply(b); | |
| 1280 | let preadj_b_hat = opA.preadjoint().apply(b_hat); | |
| 1281 | //let bounds = preadj_b.bounds().common(&preadj_b_hat.bounds()); | |
| 1282 | PlotLookup::plot_into_file_spikes( | |
| 35 | 1283 | Some(&preadj_b), |
| 1284 | Some(&preadj_b_hat), | |
| 1285 | plotgrid2, | |
| 1286 | &μ_hat, | |
| 0 | 1287 | pfx("omega_b") |
| 1288 | ); | |
| 35 | 1289 | PlotLookup::plot_into_file(&preadj_b, plotgrid2, pfx("preadj_b")); |
| 1290 | PlotLookup::plot_into_file(&preadj_b_hat, plotgrid2, pfx("preadj_b_hat")); | |
| 0 | 1291 | |
| 1292 | // Save true solution and observables | |
| 1293 | μ_hat.write_csv(pfx("orig.txt"))?; | |
| 1294 | opA.write_observable(&b_hat, pfx("b_hat"))?; | |
| 1295 | opA.write_observable(&b, pfx("b_noisy")) | |
| 1296 | } |