Normalize simulation mode Expansion, fix logs #1771
Merged
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
requested changes
Nov 15, 2023
|
Just a note. If user set xpansion mode "accurate" we use "expansion" in simulator, else "economy" |
flomnes
requested review from
tbittar,
JasonMarechal25,
sylvlecl and
guilpier-code
flomnes
changed the title
sylvlecl
reviewed
Nov 20, 2023
| //! Expansion | ||
| stdmExpansion, |
There was a problem hiding this comment.
Not necessarily for that PR, but should we rename it something more generic, like "ProblemsGeneration" ? I don't know enough the specifics of this mode to find an appropriate name though.
There was a problem hiding this comment.
Yes, this may be renamed
payetvin
reviewed
Nov 21, 2023
| @@ -110,8 +110,7 @@ bool runWeeklyOptimization(const OptimizationOptions& options, | |||
| writer)) | |||
| return false; | |||
|
|
|||
| if (problemeHebdo->ExportMPS != Data::mpsExportStatus::NO_EXPORT | |||
| || problemeHebdo->Expansion) | |||
| if (problemeHebdo->ExportMPS != Data::mpsExportStatus::NO_EXPORT) | |||
There was a problem hiding this comment.
SimulationMode shouldn't be checked also ?
There was a problem hiding this comment.
No, this is the goal of this PR. To de-correlate the MPS export & the simulation mode
|
Kudos, SonarCloud Quality Gate passed! |
This was referenced Dec 6, 2023
Closed
guilpier-code
approved these changes
Dec 11, 2023
flomnes
added a commit
that referenced
this pull request
Dec 18, 2023
* Fix expansion logs, clean up & refactor * Use enum class SimulationMode instead of enum StudyMode * Do not force MPS export when Expansion mode is enabled
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.
Goal of this PR
The goal of this PR is to normalize mode Expansion. Until now, it was a sort of hack for antares-xpansion.
Simulation mode Expansion is Economy, but with a single optimization instead of 2 optimizations + thermal heuristic for Economy / Adequacy.
Functional changes
synthesis, with suffix "exp" for the output directory (e.g 20231117-0931exp)Technical changes
Parameters::mode = stdmExpansion(renamedSimulationMode::Expansion)enum class("scoped enum") instead of C-styleenum. RemovestdmMaxbool Parameters::expansionxpansion.hand constantSTUDY_MODE_EXPANSIONswitch..caseswitch (a) { case A: +case B: someCode(); break; -case B: - someCode(); - break; }TODO
Generates tests results for new studies in mode expansion
AntaresSimulatorTeam/Antares_Simulator_Tests_NR#10