From 7735ca16ec2dc3d8e769593db4e450dada377d4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20Mar=C3=A9chal?= <45510813+JasonMarechal25@users.noreply.github.com> Date: Fri, 22 Dec 2023 09:34:07 +0100 Subject: [PATCH] Merge 1.1.1 changes (#735) * Update jupyter notebook background for dark mode * Fix typo * Fix gap contribution bug (#722) Co-authored-by: Thomas Bittar (cherry picked from commit 9eaff46e3fcc0a662eca15acbf3a032178c6302a) * Update antares deps * Remove useless cast --------- Co-authored-by: Thomas Bittar Co-authored-by: tbittar --- .gitmodules | 2 +- docs/changelog/CHANGELOG.md | 9 ++++++++- mkdocs.yml | 1 + src/cpp/benders/benders_by_batch/BendersByBatch.cpp | 5 ++--- vcpkg | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) 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 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/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' 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 = diff --git a/vcpkg b/vcpkg index 980ec0f49..72010900b 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 980ec0f49d81f794778386f7bd518b2cc9c092f0 +Subproject commit 72010900b7cee36cea77aebb97695095c9358eaf