diff -r aec67cdd6b14 -r efa60bc4f743 src/frank_wolfe.rs
--- a/src/frank_wolfe.rs	Tue Aug 01 10:32:12 2023 +0300
+++ b/src/frank_wolfe.rs	Thu Aug 29 00:00:00 2024 -0500
@@ -232,9 +232,9 @@
         //                 = C sup_{‖x‖_1 ≤ 1} ‖Ax‖_2 = C ‖A‖_{1,2},
         // 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_unconstrained(inner.method, &Ã, &g̃, self.α(),
-                                            &mut x, inner_τ, iterator);
+        let normest = findim_data.opAnorm_squared * F::cast_from(μ.len());
+        let iters = quadratic_unconstrained(&Ã, &g̃, self.α(), &mut x,
+                                            normest, inner, iterator);
         // Update masses of μ based on solution of finite-dimensional subproblem.
         μ.set_masses_dvector(&x);
 
@@ -329,9 +329,9 @@
         //                 = C sup_{‖x‖_1 ≤ 1} ‖Ax‖_2 = C ‖A‖_{1,2},
         // 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̃, self.α(),
-                                     &mut x, inner_τ, iterator);
+        let normest = findim_data.opAnorm_squared * F::cast_from(μ.len());
+        let iters = quadratic_nonneg(&Ã, &g̃, self.α(), &mut x,
+                                     normest, inner, iterator);
         // Update masses of μ based on solution of finite-dimensional subproblem.
         μ.set_masses_dvector(&x);
 
@@ -480,12 +480,11 @@
         inner_iters += reg.optimise_weights(&mut μ, opA, b, &findim_data, &config.inner, inner_it);
    
         // Merge spikes and update residual for next step and `if_verbose` below.
-        let n_before_merge = μ.len();
-        residual = μ.merge_spikes_fitness(config.merging,
-                                         |μ̃| opA.apply(μ̃) - b,
-                                          A::Observable::norm2_squared);
-        assert!(μ.len() >= n_before_merge);
-        merged += μ.len() - n_before_merge;
+        let (r, count) = μ.merge_spikes_fitness(config.merging,
+                                                |μ̃| opA.apply(μ̃) - b,
+                                                A::Observable::norm2_squared);
+        residual = r;
+        merged += count;
 
 
         // Prune points with zero mass
@@ -512,6 +511,8 @@
                 pruned,
                 ε : ε_prev,
                 postprocessing : None,
+                untransported_fraction : None,
+                transport_error : None,
             };
             inner_iters = 0;
             this_iters = 0;