Add adequacy patch optimization number to MPS filename to avoid overwrite #1187
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
- Move createOptimizationFilename to class OptPeriodStringGenerator - Remove unused arg from `getFilenameWithExtension` - Remove std::shared_ptr from function arguments
|
Kudos, SonarCloud Quality Gate passed! |
guilpier-code
requested changes
Mar 1, 2023
| @@ -45,9 +45,9 @@ AdequacyPatchOptimization::AdequacyPatchOptimization(PROBLEME_HEBDO* problemeHeb | |||
| } | |||
| void AdequacyPatchOptimization::solve(uint weekInTheYear, int hourInTheYear) | |||
| { | |||
| problemeHebdo_->adqPatchParams->AdequacyFirstStep = true; | |||
| problemeHebdo_->adequacyPatchRuntimeData->LMR_FirstOptimization = true; | |||
There was a problem hiding this comment.
ok.
Should conflict with #1189
| const std::string filename = createMPSfilename(optPeriodStringGenerator, optimizationNumber); | ||
| mpsWriterFactory mps_writer_factory(problemeHebdo->ExportMPS, problemeHebdo->exportMPSOnError, optimizationNumber, &Probleme, ortoolsUsed, solver); | ||
|
|
||
| auto adqPatchOptNumber |
There was a problem hiding this comment.
Following the oral talk we just had, I think that the MPS filename should not be computed here, but at a higher in the call stack.
Here this name should be passed as an argument.
See this comment
| @@ -110,16 +111,20 @@ bool OPT_OptimisationLineaire(PROBLEME_HEBDO* problemeHebdo, uint numSpace) | |||
| problemeHebdo->year); | |||
|
|
|||
| if (!OPT_AppelDuSimplexe( | |||
| problemeHebdo, NumeroDeLIntervalle, optimizationNumber, optPeriodStringGenerator)) | |||
| problemeHebdo, NumeroDeLIntervalle, optimizationNumber, *optPeriodStringGenerator)) | |||
There was a problem hiding this comment.
Here we should have (something like) :
auto mpsFileNames = MPSfileNames(problemeHebdo->OptimisationAuPasHebdomadaire,
NumeroDeLIntervalle,
problemeHebdo->adequacyPatchRuntimeData
problemeHebdo->weekInTheYear,
problemeHebdo->year)
if (!OPT_AppelDuSimplexe(problemeHebdo,
NumeroDeLIntervalle,
optimizationNumber,
mpsFileNames->mps()))
return false;
if (problemeHebdo->ExportMPS ......)
{
...
OPT_EcrireResultatFonctionObjectiveAuFormatTXT(optimalSolutionCost,
mpsFileNames->criterion());
}This would allow :
- extracting filenames creation from functions that print into these files
- calling getAdqPatchOptmizationNumber(...) only once.
guilpier-code
requested changes
Mar 1, 2023
| @@ -37,4 +38,8 @@ class OptPeriodStringGenerator | |||
| public: | |||
| virtual std::string to_string() const = 0; | |||
| virtual ~OptPeriodStringGenerator() = default; | |||
| std::string createOptimizationFilename(const std::string& title, | |||
There was a problem hiding this comment.
Base class OptPeriodStringGenerator is an abstraction for the optimization period, that is either :
- <year>-<week>
- <year>-<week>-<day>
inside the filename.
So why do we have a new createOptimizationFilename function that take many arguments about the whole file name ?
I guess OptPeriodStringGenerator should concern the optimization period only.
flomnes
commented
Apr 25, 2023
Comment on lines
+139
to
+140
| if (problemeHebdo->adqPatchParams | ||
| && problemeHebdo->adequacyPatchRuntimeData->LMR_FirstOptimization) |
There was a problem hiding this comment.
Suggested change
| if (problemeHebdo->adqPatchParams | |
| && problemeHebdo->adequacyPatchRuntimeData->LMR_FirstOptimization) | |
| if (problemeHebdo->adequacyPatchRuntimeData | |
| && problemeHebdo->adequacyPatchRuntimeData->LMR_FirstOptimization) |
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.
No description provided.