Logger retained, but now using HiGHS IO

Author: jajhall

highs/pdlp/HiPdlpWrapper.cpp

@@ -37,11 +37,15 @@ HighsStatus solveLpHiPdlp(const HighsOptions& options, HighsTimer& timer,
    * Unscale with HiPdlp
    * Postprocess with HiPDLP
    * ***/
-  // 2. Preprocess with HiPdlp
   PDLPSolver pdlp;
-  pdlp.setParams(options, timer);
-  HighsLp preprocessed_lp;
+
+  // 0. Set up logger and params
+  pdlp.setup(options, timer);
+
+  // 1. Pass the LP to be solved
   pdlp.passLp(&lp);
+
+  // 2. Preprocess with HiPdlp
   pdlp.preprocessLp();
 
   // 3. Scale with HiPdlp
@@ -119,4 +123,3 @@ HighsStatus solveLpHiPdlp(const HighsOptions& options, HighsTimer& timer,
   highs_solution.dual_valid = true;
   return HighsStatus::kOk;
 }
-

highs/pdlp/hipdlp/logger.cc

@@ -39,12 +39,13 @@ void Logger::setLevel(const HighsInt log_dev_level) {
   } else if (log_dev_level == kHighsLogDevLevelInfo) {
     console_level_ = LogLevel::kInfo;
   } else {
-    console_level_ = LogLevel::kInfo;//None;
+    console_level_ = LogLevel::kInfo;  // None;
   }
 }
 
 void Logger::log(LogLevel level, const std::string& message) {
-  if (level <= console_level_) 
+  // Now using HiGHS IO
+  if (level <= console_level_)
     highsLogUser(log_options_, HighsLogType::kInfo, "%s\n", message.c_str());
 }
 

highs/pdlp/hipdlp/logger.hpp

@@ -42,7 +42,9 @@ class Timer {
 class Logger {
  public:
   void setLevel(const HighsInt log_dev_level);
-  void passHighsLogOptions(const HighsLogOptions log_options) { log_options_ = log_options;}
+  void passHighsLogOptions(const HighsLogOptions log_options) {
+    log_options_ = log_options;
+  }
   void set_log_file(const std::string& filename);
   LogLevel getLogLevel() const { return console_level_; }
   // Logging methods for different levels
@@ -63,7 +65,6 @@ class Logger {
   void log(LogLevel level, const std::string& message);
   LogLevel console_level_;
   HighsLogOptions log_options_;
-  
 };
 
 #endif  // PDLP_HIPDLP_LOGGER_HPP

highs/pdlp/hipdlp/pdhg.cc

@@ -884,7 +884,7 @@ HighsStatus PDLPSolver::PowerMethod(double& op_norm_sq) {
   return HighsStatus::kWarning;
 }
 
-void PDLPSolver::setParams(const HighsOptions& options, HighsTimer& timer) {
+void PDLPSolver::setup(const HighsOptions& options, HighsTimer& timer) {
   logger_.setLevel(options.log_dev_level);
   logger_.passHighsLogOptions(options.log_options);
   logger_.print_header();

highs/pdlp/hipdlp/pdhg.hpp

@@ -35,7 +35,7 @@
 // --- Classes ---
 class PDLPSolver {
  public:
-  void setParams(const HighsOptions& options, HighsTimer& timer);
+  void setup(const HighsOptions& options, HighsTimer& timer);
   void preprocessLp();
   void scaleProblem();
   void solve(std::vector<double>& x, std::vector<double>& y);