Merge 1.1.1 changes

.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

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

mkdocs.yml

@@ -67,6 +67,7 @@ plugins:
   - mkdocs-jupyter:
       execute: False
       show_input: False
+      theme: dark
   - bibtex:
       bib_file: 'docs/user-guide/benders.bib'
 

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<double>(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 =