From aa254ec09376af7f1c55ee600e90149b9b6d3e94 Mon Sep 17 00:00:00 2001 From: Thomas Bittar Date: Thu, 5 Oct 2023 16:47:34 +0200 Subject: [PATCH 1/5] Update jupyter notebook background for dark mode --- mkdocs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/mkdocs.yml b/mkdocs.yml index 6d3760164..9e9ce735c 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -67,6 +67,7 @@ plugins: - mkdocs-jupyter: execute: False show_input: False + theme: dark - bibtex: bib_file: 'docs/user-guide/benders.bib' From 313f1c938eacac69e1af3ebd0a7f3b8cd946ce5d Mon Sep 17 00:00:00 2001 From: Thomas Bittar Date: Mon, 9 Oct 2023 09:42:01 +0200 Subject: [PATCH 2/5] Fix typo --- docs/changelog/CHANGELOG.md | 9 ++++++++- vcpkg | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/changelog/CHANGELOG.md b/docs/changelog/CHANGELOG.md index e6a412ad3..0fae13ef0 100644 --- a/docs/changelog/CHANGELOG.md +++ b/docs/changelog/CHANGELOG.md @@ -13,7 +13,14 @@ v1.2 (10/2023) - Fix issue on windows with concurrent access to log files -v1.1 (09/2023) +v1.1.1 (09/2023) +-------------------- + +### Fix + +- Update performance graph in the documentation + +v1.1.0 (09/2023) -------------------- ### Features diff --git a/vcpkg b/vcpkg index 980ec0f49..72010900b 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 980ec0f49d81f794778386f7bd518b2cc9c092f0 +Subproject commit 72010900b7cee36cea77aebb97695095c9358eaf From ab459ee76d4cb99946564716ec4f13f7db1d1ff2 Mon Sep 17 00:00:00 2001 From: tbittar Date: Wed, 22 Nov 2023 16:01:38 +0100 Subject: [PATCH 3/5] Fix gap contribution bug (#722) Co-authored-by: Thomas Bittar (cherry picked from commit 9eaff46e3fcc0a662eca15acbf3a032178c6302a) --- src/cpp/benders/benders_by_batch/BendersByBatch.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cpp/benders/benders_by_batch/BendersByBatch.cpp b/src/cpp/benders/benders_by_batch/BendersByBatch.cpp index fb2a72826..1ac6cf04b 100644 --- a/src/cpp/benders/benders_by_batch/BendersByBatch.cpp +++ b/src/cpp/benders/benders_by_batch/BendersByBatch.cpp @@ -264,7 +264,8 @@ void BendersByBatch::GetSubproblemCut( subproblem_data.var_name_and_subgradient); // dual pi_s auto subpb_cost_under_approx = GetAlpha_i()[ProblemToId(name)]; *batch_subproblems_costs_contribution_in_gap_per_proc += - subproblem_data.subproblem_cost - subpb_cost_under_approx; + std::max(subproblem_data.subproblem_cost - subpb_cost_under_approx, + static_cast(0)); double cut_value_at_x_cut = subproblem_data.subproblem_cost; for (const auto &[candidate_name, x_cut_candidate_value] : _data.x_cut) { auto subgradient_at_name = From f29735011ccbdcd18bb5a20c93007a45a607b8a3 Mon Sep 17 00:00:00 2001 From: Jason Marechal Date: Tue, 19 Dec 2023 10:23:29 +0100 Subject: [PATCH 4/5] Update antares deps --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index b8faf9ad0..6049e7386 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "antares-deps"] path = antares-deps url = https://github.com/AntaresSimulatorTeam/antares-deps.git - branch = v2.0.5 + branch = v2.0.7 [submodule "vcpkg"] path = vcpkg url = https://github.com/microsoft/vcpkg.git From 05d7b62c1d8f2976ba7d4a22c9e95e61667720c1 Mon Sep 17 00:00:00 2001 From: Thomas Bittar Date: Tue, 19 Dec 2023 13:39:51 +0100 Subject: [PATCH 5/5] Remove useless cast --- src/cpp/benders/benders_by_batch/BendersByBatch.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/cpp/benders/benders_by_batch/BendersByBatch.cpp b/src/cpp/benders/benders_by_batch/BendersByBatch.cpp index 1ac6cf04b..05f1b26cf 100644 --- a/src/cpp/benders/benders_by_batch/BendersByBatch.cpp +++ b/src/cpp/benders/benders_by_batch/BendersByBatch.cpp @@ -263,9 +263,8 @@ void BendersByBatch::GetSubproblemCut( worker->get_subgradient( subproblem_data.var_name_and_subgradient); // dual pi_s auto subpb_cost_under_approx = GetAlpha_i()[ProblemToId(name)]; - *batch_subproblems_costs_contribution_in_gap_per_proc += - std::max(subproblem_data.subproblem_cost - subpb_cost_under_approx, - static_cast(0)); + *batch_subproblems_costs_contribution_in_gap_per_proc += std::max( + subproblem_data.subproblem_cost - subpb_cost_under_approx, 0.0); double cut_value_at_x_cut = subproblem_data.subproblem_cost; for (const auto &[candidate_name, x_cut_candidate_value] : _data.x_cut) { auto subgradient_at_name =