From 93bb91a01d76c1228e0e2479c2998e6ef3ea0a2e Mon Sep 17 00:00:00 2001 From: shtadinada Date: Mon, 9 Sep 2024 13:47:47 +0200 Subject: [PATCH] FW update changes --- examples/large_example.jl | 2 +- src/as_frank_wolfe.jl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/large_example.jl b/examples/large_example.jl index 5f616fe..bace304 100644 --- a/examples/large_example.jl +++ b/examples/large_example.jl @@ -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 ) diff --git a/src/as_frank_wolfe.jl b/src/as_frank_wolfe.jl index cfaeced..45391d4 100644 --- a/src/as_frank_wolfe.jl +++ b/src/as_frank_wolfe.jl @@ -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)), @@ -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) @@ -184,7 +184,7 @@ function as_frank_wolfe( grad!, lmo, gradient, - tt, + step_type, ) if callback(state) === false break