Regulated IPX intermediate logging and added IPX header after Constructing starting basis...

Author: jajhall

highs/ipm/hipo/ipm/Solver.cpp

@@ -187,8 +187,6 @@ bool Solver::prepareIpx() {
   ipx_param.ipm_feasibility_tol = options_.feasibility_tol;
   ipx_param.ipm_optimality_tol = options_.optimality_tol;
   ipx_param.start_crossover_tol = options_.crossover_tol;
-  printf("HiPO Solver::prepareIpx() options_.time_limit = %g; control_.elapsed() = %g\n",
-	 options_.time_limit, control_.elapsed());
   ipx_param.time_limit = options_.time_limit - control_.elapsed();
   ipx_param.ipm_maxiter = options_.max_iter - iter_;
   ipx_lps_.SetParameters(ipx_param);

highs/ipm/ipx/control.cc

@@ -38,7 +38,8 @@ void Control::hLog(std::string str) const {
   } else {
     output_ << str;
   }
-
+  // Reset interval-based logging since something has been logged
+  interval_.Reset();
 }
 
 void Control::hLog(std::stringstream& logging) const {
@@ -50,9 +51,12 @@ void Control::hLog(std::stringstream& logging) const {
     output_ << logging.str();
   }
   logging.str(std::string());
+  // Reset interval-based logging since something has been logged
+  interval_.Reset();
 }
 
 void Control::hIntervalLog(std::stringstream& logging) const {
+  double interval_elapsed = interval_.Elapsed();
   if (parameters_.print_interval >= 0.0 &&
       interval_.Elapsed() >= parameters_.print_interval) {
     interval_.Reset();

highs/ipm/ipx/ipm.cc

@@ -828,7 +828,6 @@ void IPM::PrintHeader() {
     << "  " << Format("pinf", 9)
     << "  " << Format("dinf", 9)
     << "  " << Format("gap", 8);
-    //  h_logging_stream << "  " << Format("mu", 8);
   if (!control_.timelessLog())
     h_logging_stream << "   " << Format("time", 7);
   control_.hLog(h_logging_stream);

highs/ipm/ipx/ipm.h

@@ -37,6 +37,7 @@ class IPM {
 
     Int maxiter() const { return maxiter_; }
     void maxiter(Int i) { maxiter_ = i; }
+    void PrintHeader();
 
 private:
     struct Step;
@@ -67,7 +68,6 @@ class IPM {
     void SolveNewtonSystem(const double* rb, const double* rc,
                            const double* rl, const double* ru,
                            const double* sl, const double* su, Step& lhs);
-    void PrintHeader();
     void PrintOutput();
 
     const Control& control_;

highs/ipm/ipx/lp_solver.cc

@@ -394,7 +394,7 @@ void LpSolver::RunIPM() {
     info_.centring_success = false;
 
     if (x_start_.size() != 0) {
-      control_.hLog(" Using starting point provided by user. Skipping initial iterations.\n");
+        control_.hLog(" Using starting point provided by user. Skipping initial iterations.\n");
         iterate_->Initialize(x_start_, xl_start_, xu_start_,
                              y_start_, zl_start_, zu_start_);
     }
@@ -558,6 +558,7 @@ void LpSolver::BuildStartingBasis() {
 void LpSolver::RunMainIPM(IPM& ipm) {
     KKTSolverBasis kkt(control_, *basis_);
     Timer timer;
+    ipm.PrintHeader();
     ipm.maxiter(control_.ipm_maxiter());
     ipm.Driver(&kkt, iterate_.get(), &info_);
     info_.time_ipm2 = timer.Elapsed();