Legacy ortools behind API - user story 3.1 #2455
Open
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
guilpier-code
changed the title
|
…lver prevents solver from being shared among weeks
guilpier-code
commented
Oct 10, 2024
|
|
||
| private: | ||
| OrtoolsMipVariable* addVariable(double lb, double ub, bool integer, const std::string& name); | ||
|
|
||
| std::shared_ptr<operations_research::MPSolver> mpSolver_; | ||
| operations_research::MPSolver* mpSolver_; |
There was a problem hiding this comment.
As you can see, mpSolver_ is no longer a shared pointer, at least for now.
The reason is that current Antares code (where the ortools solver are called) is made in such a way that the solver must be shared between optimization and weeks.
So a solver cannot be destroyed too soon, it has to be persistent.
It's planned to handle the life time in the future.
guilpier-code
requested review from
flomnes,
payetvin,
JasonMarechal25 and
pet-mit
and removed request for
payetvin
guilpier-code
commented
Oct 10, 2024
Comment on lines
+385
to
+392
| auto ortoolsProblem = std::make_unique<OrtoolsLinearProblem>(Probleme.isMIP(), options.ortoolsSolver); | ||
| auto legacyOrtoolsFiller = std::make_unique<LegacyOrtoolsFiller>(ortoolsProblem->MPSolver(), &Probleme); | ||
| std::vector<LinearProblemFiller*> fillersCollection = {legacyOrtoolsFiller.get()}; | ||
| LinearProblemData LP_Data; | ||
| LinearProblemBuilder linearProblemBuilder(fillersCollection); | ||
|
|
||
| linearProblemBuilder.build(*ortoolsProblem, LP_Data); | ||
| auto MPproblem = std::shared_ptr<MPSolver>(ortoolsProblem->MPSolver()); |
There was a problem hiding this comment.
This block appears twice in this file.
It is meant to create a ortools MPSolver.
It's a kind of code duplication.
This duplication will be removed in a further PR
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.
Do not merge with changes on CI yaml files
What we plan to do :
More specifically, we replace the current ortools LP building with a use :
--use-ortools --ortools-solver siriusNotes :
--use-ortools --ortools-solver siriusin the CI. We can spot the expected regressions.