src/frank_wolfe.rs

changeset 24
d29d1fcf5423
parent 8
ea3ca78873e8
child 25
79943be70720
--- a/src/frank_wolfe.rs	Sun Dec 11 23:19:17 2022 +0200
+++ b/src/frank_wolfe.rs	Sun Dec 11 23:25:53 2022 +0200
@@ -53,7 +53,7 @@
 use crate::forward_model::ForwardModel;
 #[allow(unused_imports)] // Used in documentation
 use crate::subproblem::{
-    quadratic_nonneg,
+    unconstrained::quadratic_unconstrained,
     InnerSettings,
     InnerMethod,
 };
@@ -166,7 +166,7 @@
     // where C = √m satisfies ‖x‖_1 ≤ C ‖x‖_2. Since we are intested in ‖A_*A‖, no
     // square root is needed when we scale:
     let inner_τ = inner.τ0 / (findim_data.opAnorm_squared * F::cast_from(μ.len()));
-    let iters = quadratic_nonneg(inner.method, &Ã, &g̃, α, &mut x, inner_τ, iterator);
+    let iters = quadratic_unconstrained(inner.method, &Ã, &g̃, α, &mut x, inner_τ, iterator);
     // Update masses of μ based on solution of finite-dimensional subproblem.
     μ.set_masses_dvector(&x);
 

mercurial