Add missing parameter to command built by batchrun for OR-Tools (#1984)

src/solver/CMakeLists.txt

@@ -18,6 +18,7 @@ include("cmake/simulation.cmake")
 include("cmake/ts-generator.cmake")
 include("cmake/constraints-builder.cmake")
 
+add_subdirectory(utils)
 #
 # Resource file for Windows
 #
@@ -89,7 +90,8 @@ set(ANTARES_SOLVER_LIBS  ${ANTARES_SOLVER_LIBS}
 	libantares-solver-simulation
 	libantares-solver-ts-generator
 	libmodel_antares
-	libantares-core)
+	libantares-core
+	antares-utils)
 
 target_link_libraries(antares-solver
 		PRIVATE

src/solver/cmake/solver.cmake

@@ -81,17 +81,6 @@ set(RTESOLVER_OPT
 		optimisation/adequacy_patch_csr/count_constraints_variables.cpp
 
 		optimisation/opt_period_string_generator_base.h
-
-		utils/ortools_utils.h
-		utils/ortools_utils.cpp
-		utils/filename.h
-		utils/filename.cpp
-		utils/named_problem.h
-		utils/named_problem.cpp
-		utils/mps_utils.h
-		utils/mps_utils.cpp
-		utils/opt_period_string_generator.h
-		utils/opt_period_string_generator.cpp
 	)
 
 
@@ -108,4 +97,5 @@ target_link_libraries(libmodel_antares
 		sirius_solver
 		infeasible_problem_analysis
 		libantares-solver-simulation
+		antares-utils
 		)

src/solver/misc/options.cpp

@@ -54,20 +54,6 @@ using namespace Yuni;
 using namespace Antares;
 using namespace Antares::Data;
 
-static std::string availableOrToolsSolversString()
-{
-    const std::list<std::string> availableSolverList = getAvailableOrtoolsSolverName();
-    std::string availableSolverListStr;
-    for (auto it = availableSolverList.begin(); it != availableSolverList.end(); it++)
-    {
-        availableSolverListStr += *it + ";";
-    }
-    // Remove last semicolumn
-    if (!availableSolverListStr.empty())
-        availableSolverListStr.pop_back();
-    return availableSolverListStr;
-}
-
 std::unique_ptr<GetOpt::Parser> CreateParser(Settings& settings,
                                              Antares::Data::StudyLoadOptions& options)
 {

src/solver/utils/CMakeLists.txt

@@ -29,5 +29,7 @@ target_link_libraries(utils
 
 target_include_directories(utils
     PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/include
+        ${CMAKE_SOURCE_DIR}/solver/utils
 )
+
+ add_library(antares-utils ALIAS utils)

src/solver/utils/ortools_utils.cpp

@@ -11,6 +11,20 @@ using namespace operations_research;
 
 const char* const XPRESS_PARAMS = "THREADS 1 SCALING 0";
 
+std::string availableOrToolsSolversString()
+{
+    const std::list<std::string> availableSolverList = getAvailableOrtoolsSolverName();
+    std::string availableSolverListStr;
+    for (auto it = availableSolverList.begin(); it != availableSolverList.end(); it++)
+    {
+        availableSolverListStr += *it + ";";
+    }
+    // Remove last semicolumn
+    if (!availableSolverListStr.empty())
+        availableSolverListStr.pop_back();
+    return availableSolverListStr;
+}
+
 static void transferVariables(MPSolver* solver,
                               const double* bMin,
                               const double* bMax,
@@ -315,8 +329,7 @@ MPSolver* ORTOOLS_Simplexe(Antares::Optimization::PROBLEME_SIMPLEXE_NOMME* Probl
     // Provide an initial simplex basis, if any
     if (warmStart && Probleme->basisExists() && !Probleme->isMIP())
     {
-        solver->SetStartingLpBasis(Probleme->StatutDesVariables,
-                                   Probleme->StatutDesContraintes);
+        solver->SetStartingLpBasis(Probleme->StatutDesVariables, Probleme->StatutDesContraintes);
     }
 
     if (solveAndManageStatus(solver, Probleme->ExistenceDUneSolution, params))

src/solver/utils/ortools_utils.h

@@ -21,6 +21,8 @@ void ORTOOLS_EcrireJeuDeDonneesLineaireAuFormatMPS(MPSolver* solver,
  */
 std::list<std::string> getAvailableOrtoolsSolverName();
 
+std::string availableOrToolsSolversString();
+
 /*!
  *  \brief Create a MPSolver with correct linear or mixed variant
  *

src/tools/batchrun/CMakeLists.txt

@@ -37,6 +37,7 @@ INSTALL(EXPORT antares-batchrun
 
 set(BATCHRUN_LIBS
 		libantares-core
+		antares-utils
 		libantares-core-calendar
 		yuni-static-core
 		${CMAKE_THREADS_LIBS_INIT}