Skip to content

Commit afc76a7

Browse files
committed
Replace Agnostic with Adaptive
1 parent 8aaf486 commit afc76a7

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

test/argmax.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ end
116116
one_hot_argmax;
117117
Ω=half_square_norm,
118118
Ω_grad=identity_kw,
119-
frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Agnostic()),
119+
# frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Agnostic()),
120+
frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Adaptive()),
120121
),
121122
loss=mse_kw,
122123
error_function=hamming_distance,
@@ -198,7 +199,8 @@ end
198199
one_hot_argmax;
199200
Ω=half_square_norm,
200201
Ω_grad=identity_kw,
201-
frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Agnostic()),
202+
frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Adaptive()),
203+
# frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Agnostic()),
202204
),
203205
),
204206
error_function=hamming_distance,

test/paths.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ end
101101
shortest_path_maximizer;
102102
Ω=half_square_norm,
103103
Ω_grad=identity_kw,
104-
frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Agnostic()),
104+
frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Adaptive()),
105105
),
106106
loss=mse_kw,
107107
error_function=mse_kw,
@@ -177,7 +177,7 @@ end
177177
shortest_path_maximizer;
178178
Ω=half_square_norm,
179179
Ω_grad=identity_kw,
180-
frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Agnostic()),
180+
frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Adaptive()),
181181
),
182182
),
183183
error_function=mse_kw,
@@ -247,7 +247,7 @@ end
247247
shortest_path_maximizer;
248248
Ω=half_square_norm,
249249
Ω_grad=identity_kw,
250-
frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Agnostic()),
250+
frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Adaptive()),
251251
),
252252
cost,
253253
),

test/ranking.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ end
101101
ranking;
102102
Ω=half_square_norm,
103103
Ω_grad=identity_kw,
104-
frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Agnostic()),
104+
frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Adaptive()),
105105
),
106106
loss=mse_kw,
107107
error_function=hamming_distance,
@@ -170,7 +170,7 @@ end
170170
ranking;
171171
Ω=half_square_norm,
172172
Ω_grad=identity_kw,
173-
frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Agnostic()),
173+
frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Adaptive()),
174174
),
175175
),
176176
error_function=hamming_distance,
@@ -303,7 +303,7 @@ end
303303
ranking;
304304
Ω=half_square_norm,
305305
Ω_grad=identity_kw,
306-
frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Agnostic()),
306+
frank_wolfe_kwargs=(; max_iteration=10, line_search=FrankWolfe.Adaptive()),
307307
),
308308
cost,
309309
),

0 commit comments

Comments
 (0)