Skip to content

Commit 3421dd3

Browse files
Remove renorm_interval (fixed in FW now)
1 parent 57ac631 commit 3421dd3

2 files changed

Lines changed: 0 additions & 9 deletions

File tree

src/bell_frank_wolfe.jl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ function bell_frank_wolfe(
5555
reset_dots_b::Bool = true, # warm start (technical)
5656
lazy::Bool = true, # default in FW package is false
5757
max_iteration::Int = 10^9, # default in FW package is 10^4
58-
renorm_interval::Int = 10^3,
5958
nb_increment_interval::Int = 10^4,
6059
callback_interval::Int = verbose > 0 ? 10^4 : typemax(Int),
6160
hyperplane_interval::Int = verbose > 0 ? 10callback_interval : typemax(Int),
@@ -122,7 +121,6 @@ function bell_frank_wolfe(
122121
shr2 ^ (prob ? (N ÷ 2) / 2 : N / 2),
123122
verbose,
124123
epsilon,
125-
renorm_interval,
126124
nb_increment_interval,
127125
callback_interval,
128126
hyperplane_interval,
@@ -142,7 +140,6 @@ function bell_frank_wolfe(
142140
lazy,
143141
line_search = FrankWolfe.Shortstep(one(T)),
144142
max_iteration,
145-
renorm_interval = typemax(Int),
146143
trajectory = false,
147144
verbose = false,
148145
kwargs...,

src/callback.jl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ function build_callback(
55
shr2,
66
verbose,
77
epsilon,
8-
renorm_interval,
98
nb_increment_interval,
109
callback_interval,
1110
hyperplane_interval,
@@ -20,7 +19,6 @@ function build_callback(
2019
if verbose > 3
2120
println("Intervals")
2221
println(" Print: ", callback_interval)
23-
println(" Renorm: ", renorm_interval)
2422
if hyperplane_interval != typemax(Int)
2523
println(" Upper: ", hyperplane_interval)
2624
end
@@ -52,10 +50,6 @@ function build_callback(
5250
)
5351
end
5452
function callback(state, active_set, args...)
55-
if mod(state.t, renorm_interval) == 0
56-
FrankWolfe.active_set_renormalize!(active_set)
57-
FrankWolfe.compute_active_set_iterate!(active_set)
58-
end
5953
if mod(state.t, nb_increment_interval) == 0
6054
state.lmo.lmo.nb += 1
6155
end

0 commit comments

Comments
 (0)