wip

Author: Yanyu000

check/TestPdlp.cpp

@@ -333,7 +333,7 @@ TEST_CASE("pdlp-restart-add-row", "[pdlp]") {
 }
 
 TEST_CASE("hi-pdlp", "[pdlp]") {
-  std::string model = "adlittle";  //"adlittle";//"afiro";// 
+  std::string model = "afiro";  //"adlittle";//"afiro";// 
   std::string model_file =
       std::string(HIGHS_DIR) + "/check/instances/" + model + ".mps";
   Highs h;

highs/pdlp/CupdlpWrapper.cpp

@@ -205,6 +205,9 @@ HighsStatus solveLpCupdlp(const HighsOptions& options, HighsTimer& timer,
       &pdlp_num_iter);
   highs_info.pdlp_iteration_count = pdlp_num_iter;
 
+  // Print final solution using debugPdlpFinalSolutionLog
+  debugPdlpFinalSolutionLog(w->debug_pdlp_log_file, highs_solution.col_value.data(), lp.num_col_, highs_solution.row_dual.data(), lp.num_row_);
+  fclose(w->debug_pdlp_log_file);
   model_status = HighsModelStatus::kUnknown;
   highs_solution.value_valid = value_valid;
   highs_solution.dual_valid = dual_valid;

highs/pdlp/HiPdlpWrapper.cpp

@@ -14,6 +14,7 @@
 #include "pdlp/hipdlp/logger.hpp"
 #include "pdlp/hipdlp/pdhg.hpp"
 #include "pdlp/hipdlp/restart.hpp"
+#include "pdlp/cupdlp/cupdlp_utils.h"
 
 HighsStatus solveLpHiPdlp(HighsLpSolverObject& solver_object) {
   return solveLpHiPdlp(solver_object.options_, solver_object.timer_,
@@ -67,11 +68,8 @@ HighsStatus solveLpHiPdlp(const HighsOptions& options, HighsTimer& timer,
   }
 
   // print col_value and row_dual
-  for (HighsInt i = 0; i < pdlp_solution.col_value.size(); i++)
-    printf("x[%d]=%g\n", (int)i, pdlp_solution.col_value[i]);
-  for (HighsInt i = 0; i < pdlp_solution.row_dual.size(); i++)
-    printf("y[%d]=%g\n", (int)i, pdlp_solution.row_dual[i]);  
-
+  debugPdlpFinalSolutionLog(pdlp.debug_pdlp_log_file_, pdlp_solution.col_value.data(), lp.num_col_, pdlp_solution.row_dual.data(), lp.num_row_);
+  pdlp.solveReturn();
   // --- Print Summary ---
   pdlp.logSummary();
 
@@ -121,14 +119,14 @@ HighsStatus solveLpHiPdlp(const HighsOptions& options, HighsTimer& timer,
   assert(termination_status == TerminationStatus::OPTIMAL ||
          termination_status == TerminationStatus::TIMEOUT);
   //highs_solution.col_value = x;
-  highs_solution.col_value.resize(lp.num_col_);
+  //highs_solution.col_value.resize(lp.num_col_);
   //highs_solution.row_dual = y;
-  lp.a_matrix_.product(highs_solution.row_value, highs_solution.col_value);
-  lp.a_matrix_.productTranspose(highs_solution.col_dual,
-                                highs_solution.row_dual);
-  for (HighsInt iCol = 0; iCol < lp.num_col_; iCol++)
-    highs_solution.col_dual[iCol] =
-        lp.col_cost_[iCol] - highs_solution.col_dual[iCol];
+  //lp.a_matrix_.product(highs_solution.row_value, highs_solution.col_value);
+  //lp.a_matrix_.productTranspose(highs_solution.col_dual,
+  //                              highs_solution.row_dual);
+  //for (HighsInt iCol = 0; iCol < lp.num_col_; iCol++)
+  //  highs_solution.col_dual[iCol] =
+  //      lp.col_cost_[iCol] - highs_solution.col_dual[iCol];
   highs_solution.value_valid = true;
   highs_solution.dual_valid = true;
   return HighsStatus::kOk;

highs/pdlp/cupdlp/cupdlp_solver.c

@@ -1152,7 +1152,7 @@ cupdlp_retcode PDHG_Solve(const cupdlp_int* has_variables, CUPDLPwork *pdhg) {
 #endif
 
 exit_cleanup:
-  fclose(pdhg->debug_pdlp_log_file);
+  //fclose(pdhg->debug_pdlp_log_file);
   return retcode;
 }
 

highs/pdlp/cupdlp/cupdlp_utils.c

@@ -1804,4 +1804,15 @@ void debugPdlpRestarScoretLog(FILE* file, const double weight_squared, const dou
 const double dual_feas, const double obj_gap) {
   fprintf(file, "Restart Score: Weight^2 = %.6g, Primal Feas = %.6g, Dual Feas = %.6g, Obj Gap = %.6g\n", 
   weight_squared, primal_feas, dual_feas, obj_gap);
+}
+
+void debugPdlpFinalSolutionLog(FILE* file, const double* x, int nCols, const double* y, int nRows) {    
+  fprintf(file,"Primal solution (x):\n");
+  for (int i = 0; i < nCols; ++i) {
+      fprintf(file, "x[%d]=%g\n", i, x[i]);
+  }
+  fprintf(file, "Dual solution (y):\n");
+  for (int i = 0; i < nRows; ++i) {
+      fprintf(file, "y[%d]=%g\n", i, y[i]);
+  }
 }

highs/pdlp/cupdlp/cupdlp_utils.h

@@ -198,6 +198,7 @@ void writeSol(const char *fout, cupdlp_int nCols, cupdlp_int nRows,
   void debugPdlpAtyNormLog(FILE* file, const double aty_norm);
   void debugPdlpRestartLog(FILE* file, const int iter_num, const double current_score, const double average_score);
   void debugPdlpRestarScoretLog(FILE* file, const double weight_squared, const double primal_feas, const double dual_feas, const double obj_gap);
+  void debugPdlpFinalSolutionLog(FILE* file, const double* x, int nCols, const double* y, int nRows);
 
 
 #ifdef __cplusplus

highs/pdlp/hipdlp/pdhg.cc

@@ -468,7 +468,8 @@ void PDLPSolver::solve(std::vector<double>& x, std::vector<double>& y) {
         results_ = current_results;
         results_.term_code = TerminationStatus::OPTIMAL;
 
-        return solveReturn();
+        //return solveReturn();
+        return ;
       }
 
       // --- 6. Restart Check ---

highs/pdlp/hipdlp/pdhg.hpp

@@ -51,6 +51,9 @@ class PDLPSolver {
   int getIterationCount() const { return final_iter_count_; }
   void logSummary();
 
+ void solveReturn();
+ FILE* debug_pdlp_log_file_ = nullptr;
+
  private:
   // Problem data
   HighsLp lp_;                  // The problem to solve
@@ -97,11 +100,10 @@ class PDLPSolver {
   std::vector<double> dSlackPos_;
   std::vector<double> dSlackNeg_;
 
-  FILE* debug_pdlp_log_file_ = nullptr;
+
   Timer total_timer;
 
   // Helper functions
-  void solveReturn();
   void Initialize(const HighsLp& lp, std::vector<double>& x,
                   std::vector<double>& y);
   SolverResults results_;