From b1a7a48715356ee73c2543db34db597f66d24fde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Besan=C3=A7on?= Date: Tue, 29 Oct 2024 15:02:25 +0100 Subject: [PATCH 1/5] Update examples/optimal_experiment_design.jl --- examples/optimal_experiment_design.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/optimal_experiment_design.jl b/examples/optimal_experiment_design.jl index 41cc925dd..039e23cf5 100644 --- a/examples/optimal_experiment_design.jl +++ b/examples/optimal_experiment_design.jl @@ -42,7 +42,7 @@ include("oed_utils.jl") m = 50 -n = Int(floor(m/10)) +n = Int(floor(m / 10)) verbose = true ## A-Optimal Design Problem From fe08f3bf519f330f0e9cf8fb11f141e22750d06d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Besan=C3=A7on?= Date: Tue, 29 Oct 2024 15:02:42 +0100 Subject: [PATCH 2/5] Update examples/optimal_experiment_design.jl --- examples/optimal_experiment_design.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/optimal_experiment_design.jl b/examples/optimal_experiment_design.jl index 039e23cf5..32b0f8d5e 100644 --- a/examples/optimal_experiment_design.jl +++ b/examples/optimal_experiment_design.jl @@ -77,7 +77,7 @@ verbose = true domain_point=domain_point, custom_heuristics=[heu], line_search=line_search, - ) + ) # Run with Secant x0, active_set = build_start_point(Ex_mat, N, ub) From 8d3a85865e36f7d7e17cc65b75f83228e41fa1f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Besan=C3=A7on?= Date: Tue, 29 Oct 2024 15:03:12 +0100 Subject: [PATCH 3/5] Update examples/optimal_experiment_design.jl --- examples/optimal_experiment_design.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/optimal_experiment_design.jl b/examples/optimal_experiment_design.jl index 32b0f8d5e..25cc37691 100644 --- a/examples/optimal_experiment_design.jl +++ b/examples/optimal_experiment_design.jl @@ -116,7 +116,7 @@ end line_search = FrankWolfe.MonotonicGenericStepsize(FrankWolfe.Adaptive(), domain_oracle) x0, active_set = build_start_point(Ex_mat, N, ub) z = greedy_incumbent(Ex_mat, N, ub) - x, _, _ = Boscia.solve(g, grad!, blmo, active_set=active_set, start_solution=z, time_limit=10, verbose=false, domain_oracle=domain_oracle, domain_point=domain_point, custom_heuristics=[heu], line_search=line_search) + x, _, _ = Boscia.solve(g, grad!, blmo, active_set=active_set, start_solution=z, time_limit=10, verbose=false, domain_oracle=domain_oracle, domain_point=domain_point, custom_heuristics=[heu], line_search=line_search) # proper run with MGLS and Adaptive line_search = FrankWolfe.MonotonicGenericStepsize(FrankWolfe.Adaptive(), domain_oracle) From a9d1070d99620f92a675013183a4b1497c79bccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Besan=C3=A7on?= Date: Tue, 29 Oct 2024 15:05:28 +0100 Subject: [PATCH 4/5] Update src/node.jl --- src/node.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node.jl b/src/node.jl index b170f40b1..1de2146fb 100644 --- a/src/node.jl +++ b/src/node.jl @@ -84,7 +84,7 @@ function Bonobo.get_branching_nodes_info(tree::Bonobo.BnBTree, node::FrankWolfeN discarded_set_left, discarded_set_right = split_vertices_set!(node.discarded_vertices, tree, vidx, x, node.local_bounds) - # Sanity check + # Sanity check @assert isapprox(sum(active_set_left.weights), 1.0) "sum weights left: $(sum(active_set_left.weights))" @assert sum(active_set_left.weights .< 0) == 0 for v in active_set_left.atoms From a4e4e3a36f1e2d1709753ec40724de0c29fc596b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Besan=C3=A7on?= Date: Tue, 29 Oct 2024 15:06:55 +0100 Subject: [PATCH 5/5] Update src/utilities.jl --- src/utilities.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utilities.jl b/src/utilities.jl index a922eabe3..d1b4250e6 100644 --- a/src/utilities.jl +++ b/src/utilities.jl @@ -106,7 +106,7 @@ function split_vertices_set!( end deleteat!(active_set, left_del_indices) @assert !isempty(active_set) - @assert !isempty(right_as) + @assert !isempty(right_as) # renormalize active set and recompute new iterates if !isempty(active_set) FrankWolfe.active_set_renormalize!(active_set)