Added subproblem solvers in list of strategies (--strategies) + fixed…

… list of linear solvers
cvanaret · Oct 17, 2024 · 73fa292 · 73fa292
1 parent 1f373ce
commit 73fa292
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/uno/Uno.cpp b/uno/Uno.cpp
@@ -10,6 +10,9 @@
 #include "ingredients/subproblems/SubproblemFactory.hpp"
 #include "model/Model.hpp"
 #include "optimization/Iterate.hpp"
+#include "solvers/QPSolverFactory.hpp"
+#include "solvers/LPSolverFactory.hpp"
+#include "solvers/SymmetricIndefiniteLinearSolverFactory.hpp"
 #include "tools/Logger.hpp"
 #include "tools/Options.hpp"
 #include "tools/Statistics.hpp"
@@ -113,13 +116,15 @@ namespace uno {
             Iterate::number_eval_jacobian, number_hessian_evaluations, number_subproblems_solved};
    }
 
-   void join(const std::vector<std::string>& vector, char separator) {
+   std::string join(const std::vector<std::string>& vector, const std::string& separator) {
+      std::string result{};
       if (not vector.empty()) {
-         std::cout << vector[0];
+         result = vector[0];
          for (size_t variable_index: Range(1, vector.size())) {
-            std::cout << separator << ' ' << vector[variable_index];
+            result += separator + vector[variable_index];
          }
       }
+      return result;
    }
 
    void Uno::print_uno_version() {
@@ -137,18 +142,13 @@ namespace uno {
 
    void Uno::print_available_strategies() {
       std::cout << "Available strategies:\n";
-      std::cout << "Constraint relaxation strategies: ";
-      join(ConstraintRelaxationStrategyFactory::available_strategies(), ',');
-      std::cout << '\n';
-      std::cout << "Globalization mechanisms: ";
-      join(GlobalizationMechanismFactory::available_strategies(), ',');
-      std::cout << '\n';
-      std::cout << "Globalization strategies: ";
-      join(GlobalizationStrategyFactory::available_strategies(), ',');
-      std::cout << '\n';
-      std::cout << "Subproblems: ";
-      join(SubproblemFactory::available_strategies(), ',');
-      std::cout << '\n';
+      std::cout << "- Constraint relaxation strategies: " << join(ConstraintRelaxationStrategyFactory::available_strategies(), ", ") << '\n';
+      std::cout << "- Globalization mechanisms: " << join(GlobalizationMechanismFactory::available_strategies(), ", ") << '\n';
+      std::cout << "- Globalization strategies: " << join(GlobalizationStrategyFactory::available_strategies(), ", ") << '\n';
+      std::cout << "- Subproblems: " << join(SubproblemFactory::available_strategies(), ", ") << '\n';
+      std::cout << "- QP solvers: " << join(QPSolverFactory::available_solvers(), ", ") << '\n';
+      std::cout << "- LP solvers: " << join(LPSolverFactory::available_solvers(), ", ") << '\n';
+      std::cout << "- Linear solvers: " << join(SymmetricIndefiniteLinearSolverFactory::available_solvers(), ", ") << '\n';
    }
 
    void Uno::print_strategy_combination(const Options& options) {

diff --git a/uno/solvers/LPSolverFactory.hpp b/uno/solvers/LPSolverFactory.hpp
@@ -25,6 +25,15 @@ namespace uno {
 #endif
          throw std::invalid_argument("LP solver not found");
       }
+
+      // return the list of available LP solvers
+      static std::vector<std::string> available_solvers() {
+         std::vector<std::string> solvers{};
+#ifdef HAS_BQPD
+         solvers.emplace_back("BQPD");
+#endif
+         return solvers;
+      }
    };
 } // namespace
 

diff --git a/uno/solvers/SymmetricIndefiniteLinearSolverFactory.hpp b/uno/solvers/SymmetricIndefiniteLinearSolverFactory.hpp
@@ -38,6 +38,9 @@ namespace uno {
          std::vector<std::string> solvers{};
 #ifdef HAS_MA57
          solvers.emplace_back("MA57");
+#endif
+#ifdef HAS_MUMPS
+         solvers.emplace_back("MUMPS");
 #endif
          return solvers;
       }