Print the dimensions of the original (AMPL) model and of the reformul…

…ated problem
cvanaret · Oct 27, 2024 · 9a8d4ed · 9a8d4ed
1 parent 2ea6cc5
commit 9a8d4ed
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/bindings/AMPL/uno_ampl.cpp b/bindings/AMPL/uno_ampl.cpp
@@ -29,6 +29,8 @@ namespace uno {
       try {
          // AMPL model
          std::unique_ptr<Model> ampl_model = std::make_unique<AMPLModel>(model_name, options);
+         DISCRETE << "Original model " << ampl_model->name << '\n' << ampl_model->number_variables << " variables, " <<
+            ampl_model->number_constraints << " constraints\n";
 
          // initialize initial primal and dual points
          Iterate initial_iterate(ampl_model->number_variables, ampl_model->number_constraints);
@@ -39,6 +41,8 @@ namespace uno {
 
          // reformulate (scale, add slacks, relax the bounds, ...) if necessary
          std::unique_ptr<Model> model = ModelFactory::reformulate(std::move(ampl_model), initial_iterate, options);
+         DISCRETE << "Reformulated model " << model->name << '\n' << model->number_variables << " variables, " <<
+            model->number_constraints << " constraints\n";
 
          // create the constraint relaxation strategy, the globalization mechanism and the Uno solver
          auto constraint_relaxation_strategy = ConstraintRelaxationStrategyFactory::create(*model, options);

diff --git a/uno/Uno.cpp b/uno/Uno.cpp
@@ -30,8 +30,6 @@ namespace uno {
    Level Logger::level = INFO;
 
    Result Uno::solve(const Model& model, Iterate& current_iterate, const Options& options) {
-      DISCRETE << "Problem " << model.name << '\n' << model.number_variables << " variables, " << model.number_constraints << " constraints\n";
-
       Timer timer{};
       Statistics statistics = Uno::create_statistics(model, options);
 

diff --git a/uno/options/Options.cpp b/uno/options/Options.cpp
@@ -220,7 +220,7 @@ namespace uno {
       }
       // print the overwritten options
       if (number_used_options > 0) {
-         DISCRETE << "Used overwritten options:\n" << option_list << '\n';
+         DISCRETE << "\nUsed overwritten options:\n" << option_list << '\n';
       }
    }
 

diff --git a/uno/preprocessing/Preprocessing.cpp b/uno/preprocessing/Preprocessing.cpp
@@ -88,7 +88,7 @@ namespace uno {
 
    void Preprocessing::enforce_linear_constraints(const Model& model, Vector<double>& x, Multipliers& multipliers, QPSolver& qp_solver) {
       const auto& linear_constraints = model.get_linear_constraints();
-      INFO << "Preprocessing phase: the problem has " << linear_constraints.size() << " linear constraints\n";
+      INFO << "\nPreprocessing phase: the problem has " << linear_constraints.size() << " linear constraints\n";
       if (not linear_constraints.empty()) {
          // evaluate the constraints
          std::vector<double> constraints(model.number_constraints);