Remove duplication in simulation run : first trial (#282)

Co-authored-by: Guillaume PIERRE <[email protected]>
Unity-Energy-and-renewable-energy · Aug 8, 2024 · 207f376 · 207f376
1 parent 714274d
commit 207f376
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 8 deletions.
diff --git a/src/api/API.cpp b/src/api/API.cpp
@@ -62,8 +62,6 @@ SimulationResults APIInternal::execute() const
         return {.simulationPath{}, .antares_problems{}, .error = err};
     }
 
-    study_->computePThetaInfForThermalClusters();
-
     // Only those two fields are used un simulation
     Settings settings;
     settings.tsGeneratorsOnly = false;
@@ -77,6 +75,9 @@ SimulationResults APIInternal::execute() const
     auto resultWriter = Solver::resultWriterFactory(
       study_->parameters.resultFormat, study_->folderOutput, ioQueueService, durationCollector);
     SimulationObserver simulationObserver;
+
+    study_->computePThetaInfForThermalClusters();
+
     // Run the simulation
     switch (study_->runtime->mode)
     {
@@ -104,8 +105,6 @@ SimulationResults APIInternal::execute() const
     // Importing Time-Series if asked
     study_->importTimeseriesIntoInput();
 
-    // Stop the display of the progression
-    study_->progression.stop();
     return
     {
         .simulationPath = study_->folderOutput.c_str(),

diff --git a/src/solver/application/application.cpp b/src/solver/application/application.cpp
@@ -20,7 +20,6 @@
  */
 #include "antares/application/application.h"
 
-#include <yuni/datetime/timestamp.h>
 
 #include <antares/antares/fatal-error.h>
 #include <antares/application/ScenarioBuilderOwner.h>
@@ -30,7 +29,6 @@
 #include <antares/infoCollection/StudyInfoCollector.h>
 #include <antares/logs/hostinfo.h>
 #include <antares/resources/resources.h>
-#include <antares/study/version.h>
 #include <antares/sys/policy.h>
 #include <antares/writer/writer_factory.h>
 #include "antares/antares/version.h"
@@ -44,6 +42,10 @@
 #include "antares/solver/utils/ortools_utils.h"
 #include "antares/study/simulation.h"
 
+#include "antares/solver/simulation/economy.h"
+#include "antares/solver/simulation/adequacy.h"
+#include "antares/solver/simulation/solver.h"
+
 using namespace Antares::Check;
 
 namespace fs = std::filesystem;
@@ -395,10 +397,10 @@ void Application::execute()
     {
     case Data::SimulationMode::Economy:
     case Data::SimulationMode::Expansion:
-        runSimulationInEconomicMode();
+        runSimulation<Solver::Simulation::ISimulation<Solver::Simulation::Economy>>();
         break;
     case Data::SimulationMode::Adequacy:
-        runSimulationInAdequacyMode();
+        runSimulation<Solver::Simulation::ISimulation<Solver::Simulation::Adequacy>>();
         break;
     default:
         break;

diff --git a/src/solver/application/include/antares/application/application.h b/src/solver/application/include/antares/application/application.h
@@ -29,6 +29,7 @@
 #include <antares/writer/i_writer.h>
 #include "antares/infoCollection/StudyInfoCollector.h"
 #include "antares/solver/misc/options.h"
+#include "antares/solver/simulation/ISimulationObserver.h"
 
 namespace Antares::Solver
 {
@@ -95,6 +96,9 @@ class Application final: public Yuni::IEventObserver<Application, Yuni::Policy::
     void runSimulationInAdequacyMode();
     void runSimulationInEconomicMode();
 
+    template<class simulationType>
+    void runSimulation();
+
     void onLogMessage(int level, const std::string& message);
 
     //! The settings given from the command line
@@ -132,4 +136,22 @@ class Application final: public Yuni::IEventObserver<Application, Yuni::Policy::
     void postParametersChecks() const;
 
 }; // class Application
+
+template<class simulationType>
+void Application::runSimulation()
+{
+    Simulation::NullSimulationObserver observer;
+    simulationType simulation(*pStudy, pSettings, pDurationCollector, *resultWriter, observer);
+    simulation.checkWriter();
+    simulation.run();
+
+    if (!(pSettings.noOutput || pSettings.tsGeneratorsOnly))
+    {
+        pDurationCollector("synthesis_export")
+                << [&simulation] { simulation.writeResults(/*synthesis:*/ true); };
+
+        pOptimizationInfo = simulation.getOptimizationInfo();
+    }
+};
+
 } // namespace Antares::Solver