move unrelated jobs from LinearProblemMatrix

AntaresSimulatorTeam · Dec 15, 2023 · 8462829 · 8462829
1 parent f2ed940
commit 8462829
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 17 deletions.
diff --git a/src/solver/optimisation/LinearProblemMatrix.cpp b/src/solver/optimisation/LinearProblemMatrix.cpp
@@ -34,11 +34,9 @@
 using namespace Antares::Data;
 
 LinearProblemMatrix::LinearProblemMatrix(PROBLEME_HEBDO* problemeHebdo,
-                                         Solver::IResultWriter& writer,
                                          ConstraintBuilder& builder) :
  ProblemMatrixEssential(problemeHebdo),
  builder_(builder),
- writer_(writer),
  group1_(problemeHebdo, builder),
  bindingConstraintDayGroup_(problemeHebdo, builder),
  bindingConstraintWeekGroup_(problemeHebdo, builder),
@@ -59,14 +57,6 @@ LinearProblemMatrix::LinearProblemMatrix(PROBLEME_HEBDO* problemeHebdo,
                          &areaHydroLevelGroup_,
                          &finalStockGroup_};
 }
-void LinearProblemMatrix::ExportStructures()
-{
-    if (problemeHebdo_->ExportStructure && problemeHebdo_->firstWeekOfSimulation)
-    {
-        OPT_ExportInterco(writer_, problemeHebdo_);
-        OPT_ExportAreaName(writer_, problemeHebdo_->NomsDesPays);
-    }
-}
 
 void LinearProblemMatrix::Run()
 {

diff --git a/src/solver/optimisation/LinearProblemMatrix.h b/src/solver/optimisation/LinearProblemMatrix.h
@@ -45,15 +45,11 @@ using namespace Antares::Data;
 class LinearProblemMatrix : public ProblemMatrixEssential
 {
 public:
-    explicit LinearProblemMatrix(PROBLEME_HEBDO* problemeHebdo,
-                                 Solver::IResultWriter& writer,
-                                 ConstraintBuilder& builder);
+    explicit LinearProblemMatrix(PROBLEME_HEBDO* problemeHebdo, ConstraintBuilder& builder);
 
     void Run() override;
-    void ExportStructures();
 
 private:
-    Solver::IResultWriter& writer_;
     ConstraintBuilder& builder_;
     Group1 group1_;
     BindingConstraintDayGroup bindingConstraintDayGroup_;

diff --git a/src/solver/optimisation/opt_export_structure.cpp b/src/solver/optimisation/opt_export_structure.cpp
@@ -62,3 +62,9 @@ void OPT_ExportAreaName(Antares::Solver::IResultWriter& writer,
     }
     writer.addEntryFromBuffer(filename, Flot);
 }
+
+void OPT_ExportStructures(PROBLEME_HEBDO* problemeHebdo, Antares::Solver::IResultWriter& writer)
+{
+    OPT_ExportInterco(writer, problemeHebdo);
+    OPT_ExportAreaName(writer, problemeHebdo->NomsDesPays);
+}
diff --git a/src/solver/optimisation/opt_export_structure.h b/src/solver/optimisation/opt_export_structure.h
@@ -52,5 +52,6 @@ void OPT_ExportInterco(Antares::Solver::IResultWriter& writer,
                        PROBLEME_HEBDO* problemeHebdo);
 void OPT_ExportAreaName(Antares::Solver::IResultWriter& writer,
                         const std::vector<const char*>& areaNames);
+void OPT_ExportStructures(PROBLEME_HEBDO* problemeHebdo, Antares::Solver::IResultWriter& writer);
 
 #endif
diff --git a/src/solver/optimisation/opt_optimisation_lineaire.cpp b/src/solver/optimisation/opt_optimisation_lineaire.cpp
@@ -27,6 +27,7 @@
 
 #include "sim_structure_probleme_economique.h"
 #include "opt_fonctions.h"
+#include "opt_export_structure.h"
 
 #include <antares/logs/logs.h>
 #include "antares/solver/utils/filename.h"
@@ -160,9 +161,9 @@ bool OPT_OptimisationLineaire(const OptimizationOptions& options,
 
     auto builder_data = NewGetConstraintBuilderFromProblemHebdo(problemeHebdo);
     ConstraintBuilder builder(builder_data);
-    LinearProblemMatrix linearProblemMatrix(problemeHebdo, writer, builder);
+    LinearProblemMatrix linearProblemMatrix(problemeHebdo, builder);
     linearProblemMatrix.Run();
-    linearProblemMatrix.ExportStructures();
+    OPT_ExportStructures(problemeHebdo, writer);
 
     bool ret = runWeeklyOptimization(
       options, problemeHebdo, adqPatchParams, writer, PREMIERE_OPTIMISATION);