Added code to check that simplex_strategy is restored; added code to compute sum/max basic primal infeasibility in HEkkPrimal

Author: jajhall

highs/lp_data/Highs.cpp

@@ -3983,7 +3983,17 @@ HighsStatus Highs::callSolveLp(HighsLp& lp, const string message) {
   assert(model_.lp_.a_matrix_.isColwise());
 
   // Solve the LP
+  HighsInt simplex_strategy = options_.simplex_strategy;
   return_status = solveLp(solver_object, message);
+  // Ensure that options_.simplex_strategy is reset to its initial
+  // value
+  const bool restored_simplex_strategy = options_.simplex_strategy == simplex_strategy;
+  if (!restored_simplex_strategy) {
+    // #2643
+    printf("Highs::callSolveLp options_.simplex_strategy = %d, but was %d\n",
+	   int(options_.simplex_strategy), int(simplex_strategy));
+  }
+  assert(restored_simplex_strategy);
   // Extract the model status
   model_status_ = solver_object.model_status_;
   return return_status;

highs/simplex/HEkkPrimal.cpp

@@ -2773,6 +2773,10 @@ void HEkkPrimal::getBasicPrimalInfeasibility() {
   max_primal_infeasibility = 0;
   sum_primal_infeasibility = 0;
 
+  // #2643
+  HighsInt debug_num_primal_infeasibility = 0;
+  double debug_max_primal_infeasibility = 0;
+  double debug_sum_primal_infeasibility = 0;
   for (HighsInt iRow = 0; iRow < num_row; iRow++) {
     double value = info.baseValue_[iRow];
     double lower = info.baseLower_[iRow];
@@ -2791,6 +2795,19 @@ void HEkkPrimal::getBasicPrimalInfeasibility() {
           std::max(primal_infeasibility, max_primal_infeasibility);
       sum_primal_infeasibility += primal_infeasibility;
     }
+    double debug_primal_infeasibility = 0;
+    if (value < lower) {
+      debug_primal_infeasibility = lower - value;
+    } else if (value > upper) {
+      debug_primal_infeasibility = value - upper;
+    }
+    if (debug_primal_infeasibility > 0) {
+      if (debug_primal_infeasibility > primal_feasibility_tolerance)
+	debug_num_primal_infeasibility++;
+      debug_max_primal_infeasibility =
+	std::max(debug_primal_infeasibility, debug_max_primal_infeasibility);
+      debug_sum_primal_infeasibility += debug_primal_infeasibility;
+    }
   }
   if (updated_num_primal_infeasibility >= 0) {
     // The number of primal infeasibilities should be correct