Skip to content

Commit

Permalink
Merge 1.1.1 changes (#735)
Browse files Browse the repository at this point in the history
* Update jupyter notebook background for dark mode

* Fix typo

* Fix gap contribution bug (#722)

Co-authored-by: Thomas Bittar <thomas.bittar@rte-france.com>
(cherry picked from commit 9eaff46)

* Update antares deps

* Remove useless cast

---------

Co-authored-by: Thomas Bittar <thomas.bittar@rte-france.com>
Co-authored-by: tbittar <thomas.bittar@gmail.com>
  • Loading branch information
3 people authored Dec 22, 2023
1 parent 1a738b3 commit 7735ca1
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -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
9 changes: 8 additions & 1 deletion docs/changelog/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ plugins:
- mkdocs-jupyter:
execute: False
show_input: False
theme: dark
- bibtex:
bib_file: 'docs/user-guide/benders.bib'

Expand Down
5 changes: 2 additions & 3 deletions src/cpp/benders/benders_by_batch/BendersByBatch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion vcpkg
Submodule vcpkg updated 3922 files

0 comments on commit 7735ca1

Please sign in to comment.