Merge pull request #111 from cvanaret/return_result

Return the Result from Uno::solve()
cvanaret · Nov 25, 2024 · 5aea949 · 5aea949
2 parents 6757d33 + 732487e
commit 5aea949
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/bindings/AMPL/uno_ampl.cpp b/bindings/AMPL/uno_ampl.cpp
@@ -55,7 +55,13 @@ namespace uno {
          AMPLUserCallbacks user_callbacks{};
 
          // solve the instance
-         uno.solve(*model, initial_iterate, options, user_callbacks);
+         Result result = uno.solve(*model, initial_iterate, options, user_callbacks);
+         if (result.optimization_status == OptimizationStatus::SUCCESS) {
+            // check result.solution.status
+         }
+         else {
+            // ...
+         }
          // std::cout << "memory_allocation_amount = " << memory_allocation_amount << '\n';
       }
       catch (std::exception& exception) {

diff --git a/uno/Uno.cpp b/uno/Uno.cpp
@@ -33,27 +33,27 @@ namespace uno {
    Level Logger::level = INFO;
 
    // solve without user callbacks
-   void Uno::solve(const Model& model, Iterate& current_iterate, const Options& options) {
+   Result Uno::solve(const Model& model, Iterate& current_iterate, const Options& options) {
       // pass user callbacks that do nothing
       NoUserCallbacks user_callbacks{};
-      this->solve(model, current_iterate, options, user_callbacks);
+      return this->solve(model, current_iterate, options, user_callbacks);
    }
 
    // solve with user callbacks
-   void Uno::solve(const Model& model, Iterate& current_iterate, const Options& options, UserCallbacks& user_callbacks) {
+   Result Uno::solve(const Model& model, Iterate& current_iterate, const Options& options, UserCallbacks& user_callbacks) {
       Timer timer{};
       Statistics statistics = Uno::create_statistics(model, options);
       WarmstartInformation warmstart_information{};
       warmstart_information.whole_problem_changed();
-      OptimizationStatus optimization_status = OptimizationStatus::SUCCESS;
 
+      size_t major_iterations = 0;
+      OptimizationStatus optimization_status = OptimizationStatus::SUCCESS;
       try {
          // use the initial primal-dual point to initialize the strategies and generate the initial iterate
          this->initialize(statistics, current_iterate, options);
          // allocate the trial iterate once and for all here
          Iterate trial_iterate(current_iterate);
 
-         size_t major_iterations = 0;
          try {
             bool termination = false;
             // check for termination
@@ -84,13 +84,14 @@ namespace uno {
          if (Logger::level == INFO) statistics.print_footer();
 
          Uno::postprocess_iterate(model, current_iterate, current_iterate.status);
-         Result result = this->create_result(model, optimization_status, current_iterate, major_iterations, timer);
-         this->print_optimization_summary(result);
       }
       catch (const std::exception& e) {
          DISCRETE  << "An error occurred at the initial iterate: " << e.what()  << '\n';
          optimization_status = OptimizationStatus::EVALUATION_ERROR;
       }
+      Result result = this->create_result(model, optimization_status, current_iterate, major_iterations, timer);
+      this->print_optimization_summary(result);
+      return result;
    }
 
    void Uno::initialize(Statistics& statistics, Iterate& current_iterate, const Options& options) {

diff --git a/uno/Uno.hpp b/uno/Uno.hpp
@@ -21,8 +21,8 @@ namespace uno {
       Uno(GlobalizationMechanism& globalization_mechanism, const Options& options);
 
       // solve with or without user callbacks
-      void solve(const Model& model, Iterate& initial_iterate, const Options& options);
-      void solve(const Model& model, Iterate& initial_iterate, const Options& options, UserCallbacks& user_callbacks);
+      Result solve(const Model& model, Iterate& initial_iterate, const Options& options);
+      Result solve(const Model& model, Iterate& initial_iterate, const Options& options, UserCallbacks& user_callbacks);
 
       static std::string current_version();
       static void print_available_strategies();