Added TerminationStatus to PDLPSolver::solveReturn

Author: jajhall

check/TestPdlp.cpp

@@ -392,7 +392,7 @@ TEST_CASE("hi-pdlp", "[pdlp]") {
 }
 
 TEST_CASE("hi-pdlp-timer", "[pdlp]") {
-  std::string model = "shell";
+  std::string model = "shell";//"avgas";//
   std::string model_file =
       std::string(HIGHS_DIR) + "/check/instances/" + model + ".mps";
   Highs h;

highs/pdlp/HiPdlpWrapper.cpp

@@ -77,6 +77,9 @@ HighsStatus solveLpHiPdlp(const HighsOptions& options, HighsTimer& timer,
   debugPdlpFinalSolutionLog(pdlp.debug_pdlp_log_file_,
                             pdlp_solution.col_value.data(), lp.num_col_,
                             pdlp_solution.row_dual.data(), lp.num_row_);
+  pdlp.closeDebugLog();
+
+  // Report profiling
   pdlp.reportHipdlpTimer();
 
   // --- Print Summary ---

highs/pdlp/hipdlp/pdhg.cc

@@ -538,8 +538,7 @@ void PDLPSolver::solve(std::vector<double>& x, std::vector<double>& y) {
     if (solver_timer.read() > params_.time_limit) {
       logger_.info("Time limit reached.");
       final_iter_count_ = iter;
-      results_.term_code = TerminationStatus::TIMEOUT;
-      return solveReturn();
+      return solveReturn(TerminationStatus::TIMEOUT);
     }
 
     // --- 3. Convergence and Restart Check (BEFORE iterate update) ---
@@ -562,6 +561,7 @@ void PDLPSolver::solve(std::vector<double>& x, std::vector<double>& y) {
       SolverResults current_results;
       SolverResults average_results;
 
+      hipdlpTimerStart(kHipdlpClockConvergenceCheck);
       auto conv_start = std::chrono::high_resolution_clock::now();
       // Compute residuals for current iterate
       bool current_converged = checkConvergence(
@@ -574,6 +574,7 @@ void PDLPSolver::solve(std::vector<double>& x, std::vector<double>& y) {
                            params_.tolerance, average_results, "[A]");
       auto conv_end = std::chrono::high_resolution_clock::now();
       timings_.convergence_check_time += std::chrono::duration<double>(conv_end - conv_start).count();
+      hipdlpTimerStop(kHipdlpClockConvergenceCheck);
 
       debugPdlpIterHeaderLog(debug_pdlp_log_file_);
 
@@ -588,8 +589,7 @@ void PDLPSolver::solve(std::vector<double>& x, std::vector<double>& y) {
         x = x_current_;
         y = y_current_;
         results_ = current_results;
-        results_.term_code = TerminationStatus::OPTIMAL;
-        return solveReturn();
+        return solveReturn(TerminationStatus::OPTIMAL);
       }
 
       if (average_converged) {
@@ -599,8 +599,7 @@ void PDLPSolver::solve(std::vector<double>& x, std::vector<double>& y) {
         x = x_avg_;
         y = y_avg_;
         results_ = average_results;
-        results_.term_code = TerminationStatus::OPTIMAL;
-        return solveReturn();
+        return solveReturn(TerminationStatus::OPTIMAL);
       }
 
       // --- 4. Restart Check (using computed results) ---
@@ -684,7 +683,7 @@ void PDLPSolver::solve(std::vector<double>& x, std::vector<double>& y) {
           x = x_avg_;
           y = y_avg_;
 	  hipdlpTimerStop(kHipdlpClockIterateUpdate);
-          return solveReturn();
+          return solveReturn(TerminationStatus::ERROR);
         }
     }
     auto update_end = std::chrono::high_resolution_clock::now();
@@ -726,16 +725,15 @@ void PDLPSolver::solve(std::vector<double>& x, std::vector<double>& y) {
   x = x_avg_;
   y = y_avg_;
 
-  results_.term_code = TerminationStatus::TIMEOUT;
   auto solve_end = std::chrono::high_resolution_clock::now();
   timings_.total_time = std::chrono::duration<double>(solve_end - solve_start).count();
 
-  return solveReturn();
+  return solveReturn(TerminationStatus::TIMEOUT);
 }
 
-void PDLPSolver::solveReturn() {
+void PDLPSolver::solveReturn(const TerminationStatus term_code) {
+  results_.term_code = term_code;
   hipdlpTimerStop(kHipdlpClockSolve);  
-  if (debug_pdlp_log_file_) fclose(debug_pdlp_log_file_);
 }
 
 void PDLPSolver::initialize() {
@@ -1650,3 +1648,7 @@ void PDLPSolver::hipdlpTimerStop(const HighsInt hipdlp_clock) {
   HighsInt highs_timer_clock = hipdlp_clocks_.clock_[hipdlp_clock];
   hipdlp_clocks_.timer_pointer_->stop(highs_timer_clock);
 }
+
+void PDLPSolver::closeDebugLog() {
+  if (debug_pdlp_log_file_) fclose(debug_pdlp_log_file_);
+}

highs/pdlp/hipdlp/pdhg.hpp

@@ -55,10 +55,11 @@ class PDLPSolver {
   const DetailedTimings& getTimings() const { return timings_; }
 
   void reportHipdlpTimer();
+  void closeDebugLog();
 
  private:
   // --- Core Algorithm Logic ---
-  void solveReturn();
+  void solveReturn(const TerminationStatus term_code);
   void initialize();
   void printConstraintInfo();
   bool checkConvergence(const int iter, const std::vector<double>& x,