Mercurial > repos > pointsource_algs / file diff

--- a/src/subproblem/l1squared_nonneg.rs	Thu Jan 23 23:35:28 2025 +0100
+++ b/src/subproblem/l1squared_nonneg.rs	Thu Jan 23 23:34:05 2025 +0100
@@ -405,14 +405,14 @@
       I : AlgIteratorFactory<F>
 {
     match inner.method {
-        InnerMethod::PDPS | InnerMethod::Default => {
+        InnerMethod::PDPS => {
             let inner_θ = 0.001;
             // Estimate of ‖K‖ for K=θ\Id.
             let normest = inner_θ;
             let (inner_τ, inner_σ) = (inner.pdps_τσ0.0 / normest, inner.pdps_τσ0.1 / normest);
             l1squared_nonneg_pdps_alt(y, g, λ, β, x, inner_τ, inner_σ, inner_θ, iterator)
         },
-        InnerMethod::FB /*| InnerMethod::Default*/ => {
+        InnerMethod::FB => {
             // The Lipschitz factor of ∇[x ↦ g^⊤ x + λ∑x]=g - λ𝟙 is FB is just a proximal point
             // method with on constraints on τ. We “accelerate” it by adding to τ the constant θ
             // on each iteration. Exponential growth does not seem stable.
@@ -420,6 +420,6 @@
             let inner_θ = inner_τ;
             l1squared_nonneg_pp(y, g, λ, β, x, inner_τ, inner_θ, iterator)
         },
-        _ => unimplemented!("{:?}", inner.method),
+        other => unimplemented!("${other:?} is unimplemented"),
     }
 }