Now clean up hacked in pdlp_log_file

Author: jajhall

highs/pdlp/hipdlp/pdhg.cc

@@ -1,4 +1,4 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+user/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /*                                                                       */
 /*    This file is part of the HiGHS linear optimization suite           */
 /*                                                                       */

highs/pdlp/hipdlp/scaling.cc

@@ -39,7 +39,7 @@ void Scaling::LogMatrixNorms(const std::string& stage) {
   }
 
   // --- Calculate and Log Column Norms (Infinity Norm) ---
-  std::cout << "Column Infinity Norms:" << std::endl;
+  highsLogUser(params_->log_options_, HighsLogType::kInfo, "Column Infinity Norms:\n");
   for (HighsInt iCol = 0; iCol < lp.num_col_; ++iCol) {
     double max_abs_val = 0.0;
     for (HighsInt iEl = lp.a_matrix_.start_[iCol];
@@ -50,7 +50,7 @@ void Scaling::LogMatrixNorms(const std::string& stage) {
   }
 
   // --- Calculate and Log Row Norms (Infinity Norm) ---
-  std::cout << "Row Infinity Norms:" << std::endl;
+  highsLogUser(params_->log_options_, HighsLogType::kInfo, "Row Infinity Norms:\n");
   std::vector<double> row_max_abs_vals(lp.num_row_, 0.0);
   for (HighsInt iCol = 0; iCol < lp.num_col_; ++iCol) {
     for (HighsInt iEl = lp.a_matrix_.start_[iCol];
@@ -69,23 +69,23 @@ void Scaling::LogMatrixNorms(const std::string& stage) {
 
 void Scaling::scaleProblem() {
   if (params_->scaling_method == ScalingMethod::NONE) {
-    std::cout << "No scaling applied." << std::endl;
+    highsLogUser(params_->log_options_, HighsLogType::kInfo, "No scaling applied\n");
     return;
   }
 
-  std::cout << "Applying scaling method: "
-            << static_cast<int>(params_->scaling_method) << std::endl;
+  highsLogUser(params_->log_options_, HighsLogType::kInfo, "Applying scaling method: %d\n",
+	       static_cast<int>(params_->scaling_method));
   if (params_->use_pc_scaling) {
-    std::cout << "Applying Pock-Chambolle scaling..." << std::endl;
+    highsLogUser(params_->log_options_, HighsLogType::kInfo, "Applying Pock-Chambolle scaling...\n");
     ApplyPockChambolleScaling();
   }
   if (params_->use_ruiz_scaling) {
-    std::cout << "Applying Ruiz scaling..." << std::endl;
+    highsLogUser(params_->log_options_, HighsLogType::kInfo, "Applying Ruiz scaling...\n");
     ApplyRuizScaling();
   }
   if (params_->use_l2_scaling ||
       params_->scaling_method == ScalingMethod::L2_NORM) {
-    std::cout << "Applying L2 norm scaling..." << std::endl;
+    highsLogUser(params_->log_options_, HighsLogType::kInfo, "Applying L2 norm scaling...\n");
     ApplyL2Scaling();
   }
 
@@ -140,8 +140,7 @@ void Scaling::ApplyRuizScaling() {
         }
       }
     } else {
-      std::cerr << "Currently only support infinity norm for Ruiz scaling"
-                << std::endl;
+      highsLogUser(params_->log_options_, HighsLogType::kError, "Currently only support infinity norm for Ruiz scaling\n");
       exit(1);
     }
 
@@ -160,7 +159,7 @@ void Scaling::ApplyRuizScaling() {
 
 void Scaling::ApplyPockChambolleScaling() {
   if (params_->pc_alpha < 0.0 || params_->pc_alpha > 2.0) {
-    std::cerr << "PC alpha should be in [0, 2]" << std::endl;
+    highsLogUser(params_->log_options_, HighsLogType::kError, "PC alpha should be in [0, 2]\n");
     exit(1);
   }
 

highs/pdlp/hipdlp/step.cc

@@ -225,12 +225,11 @@ void PdlpStep::UpdateIteratesAdaptive(
                                  :  // in cupdlp-c, the factor is 1
                                  std::numeric_limits<double>::infinity();
 
-    // std::cout << "Iteration " << inner_iterations << ": eta = " <<
-    // current_eta
-    //           << ", movement = " << movement << ", nonlinearity = " <<
-    //           nonlinearity
-    //           << ", limit = " << step_size_limit << std::endl;
-
+    /*
+    highsLogUser(*log_options_, HighsLogType::kInfo,
+		 "Iteration %d: eta = %g, movement = %g nonlinearity = %g, limit = %g\n",
+		 inner_iterations, current_eta, movement, nonlinearity. step_size_limit);
+    */
     if (current_eta <= step_size_limit) {
       // Accept the step
       x_new = x_candidate;

highs/pdlp/hipdlp/step.hpp

@@ -73,7 +73,11 @@ class PdlpStep {
   void passDebugLogFile(const FILE* pdlp_log_file) { pdlp_log_file_ = pdlp_log_file; };
   private:
   const HighsLp* lp_;
+  // JAJH has only passed log_options_ into PdlpStep, leaving YZ to
+  // handle "params" as she sees fit.
   const HighsLogOptions* log_options_;
+  // JAJH has passed pdlp_log_file_ into PdlpStep separately, as it's
+  // only temporary.
   const FILE* pdlp_log_file_;
 };