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