Little left from fix-2214

Author: jajhall

src/mip/HighsLpRelaxation.cpp

@@ -546,11 +546,13 @@ void HighsLpRelaxation::removeCuts(HighsInt ndelcuts,
     basis.debug_origin_name = "HighsLpRelaxation::removeCuts";
     lpsolver.setBasis(basis);
     mipsolver.analysis_.mipTimerStart(kMipClockSimplexBasisSolveLp);
+    // Call to Highs::run
     lpsolver.run();
     mipsolver.analysis_.mipTimerStop(kMipClockSimplexBasisSolveLp);
   }
 }
 
+/*
 void HighsLpRelaxation::removeCuts() {
   assert(lpsolver.getLp().num_row_ ==
          (HighsInt)lpsolver.getLp().row_lower_.size());
@@ -566,6 +568,7 @@ void HighsLpRelaxation::removeCuts() {
   assert(lpsolver.getLp().num_row_ ==
          (HighsInt)lpsolver.getLp().row_lower_.size());
 }
+*/
 
 void HighsLpRelaxation::performAging(bool deleteRows) {
   assert(lpsolver.getLp().num_row_ ==
@@ -1074,6 +1077,7 @@ HighsLpRelaxation::Status HighsLpRelaxation::run(bool resolve_on_error) {
   }
 
   mipsolver.analysis_.mipTimerStart(simplex_solve_clock);
+  // Call to Highs::run
   HighsStatus callstatus = lpsolver.run();
   mipsolver.analysis_.mipTimerStop(simplex_solve_clock);
   if (mipsolver.analysis_.analyse_mip_time && !valid_basis &&
@@ -1222,6 +1226,7 @@ HighsLpRelaxation::Status HighsLpRelaxation::run(bool resolve_on_error) {
         ipm.setOptionValue("simplex_iteration_limit",
                            info.simplex_iteration_count);
         mipsolver.analysis_.mipTimerStart(kMipClockIpmSolveLp);
+        // Call to Highs::run
         ipm.run();
         mipsolver.analysis_.mipTimerStop(kMipClockIpmSolveLp);
         lpsolver.setBasis(ipm.getBasis(), "HighsLpRelaxation::run IPM basis");

src/mip/HighsLpRelaxation.h

@@ -311,7 +311,7 @@ class HighsLpRelaxation {
 
   void removeCuts(HighsInt ndelcuts, std::vector<HighsInt>& deletemask);
 
-  void removeCuts();
+  //  void removeCuts();
 
   void flushDomain(HighsDomain& domain, bool continuous = false);
 

src/mip/HighsMipSolver.h

@@ -19,6 +19,13 @@ struct HighsPseudocostInitialization;
 class HighsCliqueTable;
 class HighsImplications;
 
+enum class HighsMipInstruction {
+  kContinue,
+  kTimeLimit,
+  kInterrupt,
+  kMemoryLimit
+};
+
 class HighsMipSolver {
  public:
   HighsCallback* callback_;

src/mip/HighsMipSolverData.cpp

@@ -314,6 +314,7 @@ void HighsMipSolverData::startAnalyticCenterComputation(
     //    }
 
     mipsolver.analysis_.mipTimerStart(kMipClockIpmSolveLp);
+    // Call to Highs::run
     ipm.run();
     mipsolver.analysis_.mipTimerStop(kMipClockIpmSolveLp);
     const std::vector<double>& sol = ipm.getSolution().col_value;
@@ -1029,6 +1030,7 @@ double HighsMipSolverData::transformNewIntegerFeasibleSolution(
       tmpSolver.setOptionValue("presolve", kHighsOffString);
     tmpSolver.passModel(std::move(fixedModel));
     mipsolver.analysis_.mipTimerStart(kMipClockSimplexNoBasisSolveLp);
+    // Call to Highs::run
     tmpSolver.run();
     mipsolver.analysis_.mipTimerStop(kMipClockSimplexNoBasisSolveLp);