Skip to content

Commit

Permalink
FW update changes
Browse files Browse the repository at this point in the history
  • Loading branch information
shtadinada committed Sep 9, 2024
1 parent 939d837 commit 93bb91a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion examples/large_example.jl
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ x, v, primal, dual_gap, traj_data = as_frank_wolfe(
line_search = FrankWolfe.FixedStep(1.0),
callback=callback,
verbose=true,
max_iteration=2
max_iteration=1e7
)


6 changes: 3 additions & 3 deletions src/as_frank_wolfe.jl
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function as_frank_wolfe(
format_string = "%6s %13s %14e %14e %14e %14e %14e\n"
function format_state(state)
rep = (
FrankWolfe.st[Symbol(state.tt)],
FrankWolfe.steptype_string[Symbol(state.step_type)],
string(state.t),
Float64(state.primal),
Float64(norm(v-x0)),
Expand All @@ -51,7 +51,7 @@ function as_frank_wolfe(
primal = Inf
v = []
x = x0
tt = FrankWolfe.regular
step_type = FrankWolfe.ST_REGULAR

if trajectory
callback = FrankWolfe.make_trajectory_callback(callback, traj_data)
Expand Down Expand Up @@ -184,7 +184,7 @@ function as_frank_wolfe(
grad!,
lmo,
gradient,
tt,
step_type,
)
if callback(state) === false
break
Expand Down

0 comments on commit 93bb91a

Please sign in to comment.