Changed the option name BQPD_print_subproblem to print_subproblem [sk…

…ip ci]
cvanaret · Nov 5, 2024 · 2d1e69e · 2d1e69e
1 parent b6159bb
commit 2d1e69e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/uno/Uno.hpp b/uno/Uno.hpp
@@ -15,14 +15,6 @@ namespace uno {
    class Statistics;
    class Timer;
 
-   /*
-   struct TimeOut : public std::exception {
-      [[nodiscard]] const char* what() const noexcept override {
-         return "The time limit was exceeded.\n";
-      }
-   };
-   */
-
    class Uno {
    public:
       Uno(GlobalizationMechanism& globalization_mechanism, const Options& options);

diff --git a/uno/options/DefaultOptions.cpp b/uno/options/DefaultOptions.cpp
@@ -68,6 +68,7 @@ namespace uno {
       options["residual_norm"] = "INF";
       options["residual_scaling_threshold"] = "100.";
       options["protect_actual_reduction_against_roundoff"] = "no";
+      options["print_subproblem"] = "no";
 
       /** globalization strategy options **/
       options["armijo_decrease_fraction"] = "1e-4";
@@ -180,7 +181,6 @@ namespace uno {
       options["least_square_multiplier_max_norm"] = "1e3";
 
       /** BQPD options **/
-      options["BQPD_print_subproblem"] = "no";
       options["BQPD_kmax"] = "500";
 
       /** AMPL options **/

diff --git a/uno/solvers/BQPD/BQPDSolver.cpp b/uno/solvers/BQPD/BQPDSolver.cpp
@@ -58,7 +58,7 @@ namespace uno {
          hessian_values(this->size_hessian_workspace),
          hessian_sparsity(this->size_hessian_sparsity_workspace),
          current_hessian_indices(number_variables),
-         print_subproblem(options.get_bool("BQPD_print_subproblem")) {
+         print_subproblem(options.get_bool("print_subproblem")) {
       // default active set
       for (size_t variable_index: Range(number_variables + number_constraints)) {
          this->active_set[variable_index] = static_cast<int>(variable_index) + this->fortran_shift;
@@ -112,7 +112,7 @@ namespace uno {
             DEBUG << "gradient c" << constraint_index << ": " << constraint_jacobian[constraint_index];
          }
          for (size_t variable_index: Range(number_variables)) {
-            DEBUG << "d_x" << variable_index << " in [" << variables_lower_bounds[variable_index] << ", " << variables_upper_bounds[variable_index] << "]\n";
+            DEBUG << "d" << variable_index << " in [" << variables_lower_bounds[variable_index] << ", " << variables_upper_bounds[variable_index] << "]\n";
          }
          for (size_t constraint_index: Range(number_constraints)) {
             DEBUG << "linearized c" << constraint_index << " in [" << constraints_lower_bounds[constraint_index] << ", " << constraints_upper_bounds[constraint_index] << "]\n";