Merge 1.1.1 changes #735
Merged
Merge 1.1.1 changes #735
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Thomas Bittar <thomas.bittar@rte-france.com> (cherry picked from commit 9eaff46)
ianmnz
reviewed
Dec 19, 2023
| @@ -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<double>(0)); | |||
There was a problem hiding this comment.
Peut-être que je suis en peu pédant ou j'ai loupé qq chose, mais un literal 0.0 est déjà un double. Pourquoi faire le casting ?
There was a problem hiding this comment.
Oui^^ @JasonMarechal25 je fais la modif direct dans cette PR où on le fait d'abord dans la branche de la release 1.1.1 ?
There was a problem hiding this comment.
C'est une branche à part, où j'ai cherry-pick des truc de la 1.1.1, donc tu peux faire ici
tbittar
approved these changes
Dec 19, 2023
ianmnz
approved these changes
Dec 19, 2023
a-zakir
approved these changes
Dec 19, 2023
|
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge changes from 1.1.1