other improvements

AntaresSimulatorTeam · Nov 8, 2024 · 7e59583 · 7e59583
1 parent 7bfcf08
commit 7e59583
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 18 deletions.
diff --git a/src/libs/antares/checks/checkLoadedInputData.cpp b/src/libs/antares/checks/checkLoadedInputData.cpp
@@ -29,9 +29,9 @@
 
 namespace Antares::Check
 {
-void checkOrtoolsUsage(Antares::Data::UnitCommitmentMode ucMode,
-                       bool ortoolsUsed,
-                       const std::string& solverName)
+void checkSolverMILPincompatibility(Antares::Data::UnitCommitmentMode ucMode,
+                                    bool ortoolsUsed,
+                                    const std::string& solverName)
 {
     using namespace Antares::Data;
     if (ucMode == UnitCommitmentMode::ucMILP)

diff --git a/src/libs/antares/checks/include/antares/checks/checkLoadedInputData.h b/src/libs/antares/checks/include/antares/checks/checkLoadedInputData.h
@@ -24,9 +24,9 @@
 namespace Antares::Check
 {
 
-void checkOrtoolsUsage(Antares::Data::UnitCommitmentMode ucMode,
-                       bool ortoolsUsed,
-                       const std::string& solverName);
+void checkSolverMILPincompatibility(Antares::Data::UnitCommitmentMode ucMode,
+                                    bool ortoolsUsed,
+                                    const std::string& solverName);
 
 void checkStudyVersion(const AnyString& optStudyFolder);
 

diff --git a/src/solver/application/application.cpp b/src/solver/application/application.cpp
@@ -277,9 +277,9 @@ void Application::startSimulation(Data::StudyLoadOptions& options)
 void Application::postParametersChecks() const
 { // Some more checks require the existence of pParameters, hence of a study.
     // Their execution is delayed up to this point.
-    checkOrtoolsUsage(pParameters->unitCommitment.ucMode,
-                      pParameters->optOptions.ortoolsUsed,
-                      pParameters->optOptions.ortoolsSolver);
+    checkSolverMILPincompatibility(pParameters->unitCommitment.ucMode,
+                                   pParameters->optOptions.ortoolsUsed,
+                                   pParameters->optOptions.ortoolsSolver);
 
     checkSimplexRangeHydroPricing(pParameters->simplexOptimizationRange,
                                   pParameters->hydroPricing.hpMode);

diff --git a/src/solver/misc/options.cpp b/src/solver/misc/options.cpp
@@ -264,7 +264,7 @@ void checkAndCorrectSettingsAndOptions(Settings& settings, Data::StudyLoadOption
     }
 }
 
-void checkOrtoolsSolver(const Optimization::OptimizationOptions& optOptions)
+void checkOrtoolsSolver(const Antares::Solver::Optimization::OptimizationOptions& optOptions)
 {
     if (optOptions.ortoolsUsed)
     {

diff --git a/src/tools/batchrun/main.cpp b/src/tools/batchrun/main.cpp
@@ -124,14 +124,7 @@ int main(int argc, const char* argv[])
 
         if (not finder.list.empty())
         {
-            if (finder.list.size() > 1)
-            {
-                logs.info() << "Found " << finder.list.size() << " studies";
-            }
-            else
-            {
-                logs.info() << "Found 1 study";
-            }
+            logs.info() << "Number of studies found : " << finder.list.size();
             logs.info() << "Starting...";
 
             // The folder that contains the solver
-Original file line number
+Diff line change
@@ Expand Up @@
         }
     }
-    void checkOrtoolsSolver(const Optimization::OptimizationOptions& optOptions)
+    void checkOrtoolsSolver(const Antares::Solver::Optimization::OptimizationOptions& optOptions)
     {
         if (optOptions.ortoolsUsed)
         {
@@ Expand Down @@