Skip to content

Commit 635b90a

Browse files
Remove the condition mk = -Inf
1 parent 5eb9351 commit 635b90a

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

src/R2DH.jl

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ function R2DH(
174174
time_hist = zeros(maxIter+1)
175175
FHobj_hist = fill!(Vector{R}(undef, Mmonotone - 1), R(-Inf))
176176
Complex_hist = zeros(Int, maxIter+1)
177-
k_prox = 0
178177
if verbose > 0
179178
#! format: off
180179
@info @sprintf "%6s %8s %8s %7s %8s %7s %7s %7s %1s" "iter" "f(x)" "h(x)" "√(ξ/ν)" "ρ" "σ" "‖x‖" "‖s‖" ""
@@ -200,7 +199,6 @@ function R2DH(
200199
tired = maxIter > 0 && k maxIter || elapsed_time > maxTime
201200

202201
while !(optimal || tired)
203-
k_prox += 1
204202
# model with diagonal hessian
205203
φ(d) = ∇fk' * d + (d' * (Dkσk .* d)) / 2
206204
mk(d) = φ(d) + ψ(d)
@@ -212,24 +210,14 @@ function R2DH(
212210
end
213211
mks = mk(s)
214212

215-
if mks == -Inf
216-
σk = σk * γ
217-
Dkσk .= D.d .+ σk
218-
DNorm = norm(D.d, Inf)
219-
ν = 1 / ((DNorm + σk) * (1 + θ))
220-
@. mν∇fk = -ν * ∇fk
221-
continue
222-
end
223-
224213
k = k + 1
225214
elapsed_time = time() - start_time
226215
Fobj_hist[k] = fk
227216
Hobj_hist[k] = hk
228217
time_hist[k] = elapsed_time
229218
Mmonotone > 1 && (FHobj_hist[mod(k-1, Mmonotone - 1) + 1] = fk + hk)
230219

231-
Complex_hist[k] += k_prox
232-
k_prox = 0
220+
Complex_hist[k] += 1
233221
xkn .= xk .+ s
234222
fkn = f(xkn)
235223
hkn = h(xkn[selected])

0 commit comments

Comments
 (0)