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