Fixed max sub-MIP level, but rename data members for clarity

Author: jajhall

check/TestMipSolver.cpp

@@ -1130,7 +1130,7 @@ TEST_CASE("ines", "[highs_test_mip_solver]") {
   lp.a_matrix_.value_ = {1, -2, 3, -6, 7, 4, -6, 7, -4, -1, 2, -3};
   double required_objective_value = 215;
   Highs h;
-  //  h.setOptionValue("output_flag", dev_run);
+  h.setOptionValue("output_flag", dev_run);
   h.setOptionValue("presolve", kHighsOffString);
   REQUIRE(h.passModel(lp) == HighsStatus::kOk);
   REQUIRE(h.run() == HighsStatus::kOk);

highs/mip/HighsMipSolver.cpp

@@ -134,6 +134,9 @@ void HighsMipSolver::run() {
       mipdata_->transformNewIntegerFeasibleSolution(std::vector<double>());
       mipdata_->saveReportMipSolution();
     }
+    if (!mipdata_->mipIsKnapsack()) {
+      if (!mipdata_->mipIsInes()) mipdata_->mipIsOther();
+    }
     cleanupSolve();
     return;
   }
@@ -899,7 +902,7 @@ void HighsMipSolver::cleanupSolve(const bool mip_logging) {
   HighsInt num_ines_mip = 0;
   size_t sum_ines_num_col = 0;
   size_t sum_ines_num_row = 0;
-  HighsInt lc_max_submip_level = -1;
+  HighsInt max_global_submip_level = -1;
   HighsInt min_submip_sum_dim = kHighsIInf;
   HighsInt min_submip_num_col = kHighsIInf;
   HighsInt min_submip_num_row = kHighsIInf;
@@ -919,9 +922,8 @@ void HighsMipSolver::cleanupSolve(const bool mip_logging) {
       default:
         break;
     }
-    HighsInt lc_submip_level = mip_problem_data[iMip].submip_level;
-
-    lc_max_submip_level = std::max(lc_submip_level, lc_max_submip_level);
+    HighsInt global_submip_level = mip_problem_data[iMip].submip_level;
+    max_global_submip_level = std::max(global_submip_level, max_global_submip_level);
     HighsInt submip_num_col = mip_problem_data[iMip].num_continuous +
                               mip_problem_data[iMip].num_binary +
                               mip_problem_data[iMip].num_general_integer +
@@ -935,9 +937,9 @@ void HighsMipSolver::cleanupSolve(const bool mip_logging) {
     }
     if (full_submip_logging)
       highsLogUser(options_mip_->log_options, HighsLogType::kInfo,
-                   "  MIP               %3d (level = %2d; %3d conts; %3d bin; "
-                   "%3d gen; %3d impl; cols / rows: %3d / %3d; type %s)\n",
-                   int(iMip), int(lc_submip_level),
+                   "  MIP               %3d (level = %2d; %6d conts; %6d bin; "
+                   "%6d gen; %6d impl; cols / rows: %6d / %6d; type %s)\n",
+                   int(iMip), int(global_submip_level),
                    int(mip_problem_data[iMip].num_continuous),
                    int(mip_problem_data[iMip].num_binary),
                    int(mip_problem_data[iMip].num_general_integer),
@@ -955,7 +957,8 @@ void HighsMipSolver::cleanupSolve(const bool mip_logging) {
 
   std::stringstream ss;
   ss.str(std::string());
-  ss << highsFormatToString("  Max sub-MIP depth %d", int(max_submip_level));
+  assert(submip_level + max_submip_level == max_global_submip_level);
+  ss << highsFormatToString("  Max sub-MIP level %d", int(submip_level + max_submip_level));
   if (max_submip_level > 0)
     ss << highsFormatToString(" (min cols/rows: %d/%d)\n",
                               int(min_submip_num_col), int(min_submip_num_row));

highs/mip/HighsPrimalHeuristics.cpp

@@ -150,19 +150,15 @@ bool HighsPrimalHeuristics::solveSubMip(
   submipsolver.implicinit = &mipsolver.mipdata_->implications;
   // Solve the sub-MIP
   submipsolver.run();
+  // Update the local max_submip_level for the MIP solver
   mipsolver.max_submip_level =
-      std::max(submipsolver.max_submip_level + 1, mipsolver.max_submip_level);
+      std::max(1 + submipsolver.max_submip_level, mipsolver.max_submip_level);
 
   // Append the sub-MIP problem data to this MIP problem data
-  std::vector<HighsMipProblemData> mipsolver_mip_data =
-      mipsolver.mipdata_->mip_problem_data_;
-  std::vector<HighsMipProblemData> submipsolver_mip_data =
-      submipsolver.mipdata_->mip_problem_data_;
   mipsolver.mipdata_->mip_problem_data_.insert(
       mipsolver.mipdata_->mip_problem_data_.end(),
       submipsolver.mipdata_->mip_problem_data_.begin(),
       submipsolver.mipdata_->mip_problem_data_.end());
-  mipsolver_mip_data = mipsolver.mipdata_->mip_problem_data_;
 
   if (!mipsolver.submip) mipsolver.analysis_.mipTimerStop(kMipClockSubMipSolve);
   if (submipsolver.mipdata_) {