diff --git a/src/R2DH.jl b/src/R2DH.jl index 004c7e3f..1b48bc07 100644 --- a/src/R2DH.jl +++ b/src/R2DH.jl @@ -174,7 +174,6 @@ function R2DH( time_hist = zeros(maxIter+1) FHobj_hist = fill!(Vector{R}(undef, Mmonotone - 1), R(-Inf)) Complex_hist = zeros(Int, maxIter+1) - k_prox = 0 if verbose > 0 #! format: off @info @sprintf "%6s %8s %8s %7s %8s %7s %7s %7s %1s" "iter" "f(x)" "h(x)" "√(ξ/ν)" "ρ" "σ" "‖x‖" "‖s‖" "" @@ -200,7 +199,6 @@ function R2DH( tired = maxIter > 0 && k ≥ maxIter || elapsed_time > maxTime while !(optimal || tired) - k_prox += 1 # model with diagonal hessian φ(d) = ∇fk' * d + (d' * (Dkσk .* d)) / 2 mk(d) = φ(d) + ψ(d) @@ -212,15 +210,6 @@ function R2DH( end mks = mk(s) - if mks == -Inf - σk = σk * γ - Dkσk .= D.d .+ σk - DNorm = norm(D.d, Inf) - ν = 1 / ((DNorm + σk) * (1 + θ)) - @. mν∇fk = -ν * ∇fk - continue - end - k = k + 1 elapsed_time = time() - start_time Fobj_hist[k] = fk @@ -228,8 +217,7 @@ function R2DH( time_hist[k] = elapsed_time Mmonotone > 1 && (FHobj_hist[mod(k-1, Mmonotone - 1) + 1] = fk + hk) - Complex_hist[k] += k_prox - k_prox = 0 + Complex_hist[k] += 1 xkn .= xk .+ s fkn = f(xkn) hkn = h(xkn[selected])