Merge branch 'develop' into feature/save_restore_benders

AntaresSimulatorTeam · Jan 21, 2025 · 5917988 · 5917988
2 parents f778faf + c4683a8
commit 5917988
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/cpp/lpnamer/problem_modifier/MasterGeneration.cpp b/src/cpp/lpnamer/problem_modifier/MasterGeneration.cpp
@@ -56,8 +56,6 @@ void MasterGeneration::write_master_mps(
 
 std::filesystem::path FileNameForStructureFile(const std::string& problemName,
                                              std::string solverName) {
-  const std::string save_ext = ".svf";
-  const std::string default_ext = ".mps";
   if (problemName == "master") return {"master"};
   return SolverConfig::FileName(problemName, SolverConfig(std::move(solverName)));
 }

diff --git a/src/cpp/multisolver_interface/SolverFactory.cpp b/src/cpp/multisolver_interface/SolverFactory.cpp
@@ -54,6 +54,23 @@ std::vector<std::string> SolverLoader::GetSupportedSolvers() {
   return supported_solvers;
 }
 
+/**
+ * @brief Returns a list of supported solvers
+ * Supported doesn't mean available, for exemple if licence are not available
+ * @return
+ */
+std::vector<std::string> SolverLoader::GetSupportedSolvers() {
+  static std::vector<std::string> supported_solvers;
+  if (supported_solvers.empty()) {
+    supported_solvers.emplace_back(XPRESS_STR);
+#ifdef COIN_OR
+    supported_solvers.emplace_back(CLP_STR);
+    supported_solvers.emplace_back(CBC_STR);
+#endif
+  }
+  return supported_solvers;
+}
+
 SolverFactory::SolverFactory(std::shared_ptr<ILoggerXpansion> logger)
     : _available_solvers(SolverLoader::GetAvailableSolvers(logger)),
       logger_(std::move(logger)) {