Corrected use of bounds_measure_ and costs_measure_; removed kTerminationLogging code

Author: jajhall

highs/ipm/ipx/ipm.cc

@@ -821,8 +821,7 @@ void IPM::PrintHeader() {
   std::stringstream h_logging_stream;
   h_logging_stream.str(std::string());
   h_logging_stream
-    << (kTerminationLogging ? "\n" : "")
-    << " "  << Format("Iter", 4)
+    << " " << Format("Iter", 4)
     << "  " << Format("primal obj", 15)
     << "  " << Format("dual obj", 15)
     << "  " << Format("pinf", 9)
@@ -844,16 +843,15 @@ void IPM::PrintHeader() {
 void IPM::PrintOutput() {
     const bool ipm_optimal = iterate_->feasible() && iterate_->optimal();
 
-    if (kTerminationLogging) PrintHeader();
     double logging_pobj = iterate_->pobjective_after_postproc();
     double logging_dobj = iterate_->dobjective_after_postproc();
     double logging_presidual = iterate_->presidual();
     double logging_dresidual = iterate_->dresidual();
 
     // Now logging relative primal and dual infeasibility, and also
     // the relative primal dual objective gap
-    logging_presidual /= (1.0 + iterate_->bounds_measure_);
-    logging_dresidual /= (1.0 + iterate_->costs_measure_);
+    logging_presidual /= iterate_->bounds_measure_;
+    logging_dresidual /= iterate_->costs_measure_;
     double logging_gap = std::abs(logging_pobj - logging_dobj) /
       (1.0+0.5 *std::fabs(logging_pobj + logging_dobj));
 

highs/ipm/ipx/iterate.cc

@@ -222,38 +222,21 @@ double Iterate::mu_max() const { Evaluate(); return mu_max_; }
 
 bool Iterate::feasible() const {
     Evaluate();
-    const double rel_presidual = presidual_ / bounds_measure_;
-    const double rel_dresidual = dresidual_ / costs_measure_;
-    const bool primal_feasible = presidual_ <= feasibility_tol_ * (bounds_measure_);
-    const bool dual_feasible = dresidual_ <= feasibility_tol_ * (costs_measure_);
+    const bool primal_feasible = presidual_ <= feasibility_tol_ * bounds_measure_;
+    const bool dual_feasible = dresidual_ <= feasibility_tol_ * costs_measure_;
     const bool is_feasible = primal_feasible && dual_feasible;
-    if (kTerminationLogging) {
-      printf("\nIterate::feasible presidual_ = %11.4g; bounds_measure = %11.4g; "
-	     "rel_presidual = %11.4g; feasibility_tol = %11.4g: primal_feasible = %d\n",
-	     presidual_, bounds_measure_, rel_presidual, feasibility_tol_, primal_feasible);
-      printf("Iterate::feasible dresidual_ = %11.4g;  costs_measure = %11.4g; "
-	     "rel_dresidual = %11.4g; feasibility_tol = %11.4g:   dual_feasible = %d\n",
-	     dresidual_, costs_measure_, rel_dresidual, feasibility_tol_, dual_feasible);
-    }
     return is_feasible;
 }
 
 bool Iterate::optimal() const {
     Evaluate();
     double pobj = pobjective_after_postproc();
     double dobj = dobjective_after_postproc();
-    double obj = 0.5 * (pobj + dobj);
+    double ave_obj = 0.5 * (pobj + dobj);
     double gap = pobj - dobj;
     const double abs_gap = std::abs(gap);
-    const double obj_measure = 1.0+std::abs(obj);
+    const double obj_measure = 1.0+std::abs(ave_obj);
     const bool is_optimal = abs_gap <= optimality_tol_ * obj_measure;
-    if (kTerminationLogging) {
-      const double rel_gap = abs_gap / obj_measure; 
-      printf("Iterate::optimal     abs_gap = %11.4g;"
-	     " obj_measure    = %11.4g; rel_gap       = %11.4g;"
-	     "  optimality_tol = %11.4g:   optimal       = %d\n",
-	     abs_gap, obj_measure, rel_gap, optimality_tol_, is_optimal);
-    }
     return is_optimal;
 }
 

highs/ipm/ipx/utils.h

@@ -4,8 +4,6 @@
 #include <vector>
 #include "ipm/ipx/ipx_internal.h"
 
-const bool kTerminationLogging = false;
-
 namespace ipx {
 
 bool AllFinite(const Vector& x);