--- a/src/main.rs Tue Aug 01 10:32:12 2023 +0300 +++ b/src/main.rs Thu Aug 29 00:00:00 2024 -0500 @@ -10,7 +10,8 @@ // Linear operators may be written e.g. as `opA`, to keep the capital letters of mathematical // convention while referring to the type (trait) of the operator as `A`. #![allow(non_snake_case)] -#![feature(drain_filter)] +// Need to create parse errors +#![feature(dec2flt)] use clap::Parser; use serde::{Serialize, Deserialize}; @@ -36,6 +37,7 @@ pub mod regularisation; pub mod dataterm; pub mod fb; +pub mod radon_fb; pub mod sliding_fb; pub mod frank_wolfe; pub mod pdps; @@ -170,6 +172,18 @@ /// regularisation parameters. Only affects PDPS. sigma0 : Option<F>, + #[arg(long)] + /// Normalised transport step length for sliding_fb. + theta0 : Option<F>, + + #[arg(long)] + /// Transport toleranced wrt. ω + transport_tolerance_omega : Option<F>, + + #[arg(long)] + /// Transport toleranced wrt. ∇v + transport_tolerance_dv : Option<F>, + #[arg(value_enum, long)] /// PDPS acceleration, when available. acceleration : Option<pdps::Acceleration>,