fix compile

AntaresSimulatorTeam · Jul 16, 2024 · 44678a2 · 44678a2
1 parent dab893f
commit 44678a2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/solver/utils/ortools_utils.cpp b/src/solver/utils/ortools_utils.cpp
@@ -401,6 +401,19 @@ std::list<std::string> getAvailableOrtoolsSolverName()
     return result;
 }
 
+std::string availableOrToolsSolversString()
+{
+    const std::list<std::string> availableSolverList = getAvailableOrtoolsSolverName();
+    std::ostringstream solvers;
+    for (const std::string& avail: availableSolverList)
+    {
+        bool last = &avail == &availableSolverList.back();
+        std::string sep = last ? "." : ", ";
+        solvers << avail << sep;
+    }
+    return solvers.str();
+}
+
 MPSolver* MPSolverFactory(const Antares::Optimization::PROBLEME_SIMPLEXE_NOMME* probleme,
                           const std::string& solverName)
 {

diff --git a/src/solver/utils/ortools_utils.h b/src/solver/utils/ortools_utils.h
@@ -21,6 +21,13 @@ void ORTOOLS_EcrireJeuDeDonneesLineaireAuFormatMPS(MPSolver* solver,
  */
 std::list<std::string> getAvailableOrtoolsSolverName();
 
+/*!
+ *  \brief Return a single string containing all solvers available, separated by a ", " and ending
+ * with a ".".
+ *
+ */
+std::string availableOrToolsSolversString();
+
 /*!
  *  \brief Create a MPSolver with correct linear or mixed variant
  *

diff --git a/src/tools/batchrun/main.cpp b/src/tools/batchrun/main.cpp
@@ -39,8 +39,7 @@
 #include "../../ui/common/winmain.hxx"
 #include <antares/version.h>
 #include <antares/locale.h>
-#include <antares/args/args_to_utf8.h>
-#include <antares/solver/utils/ortools_utils.h>
+#include "../solver/utils/ortools_utils.h"
 
 #ifdef YUNI_OS_WINDOWS
 #include <process.h>
@@ -261,7 +260,7 @@ int main(int argc, char* argv[])
 
             // The folder that contains the solver
             String dirname;
-            IO::parent_path(dirname, solver);
+            IO::ExtractFilePath(dirname, solver);
 
             String cmd;