IPX now used in HighsMipSolverData::startAnalyticCenterComputation

Author: jajhall

check/TestMipSolver.cpp

@@ -1186,9 +1186,8 @@ TEST_CASE("get-fixed-lp", "[highs_test_mip_solver]") {
   REQUIRE(h.run() == HighsStatus::kOk);
 
   // REQUIRE(h.getInfo().objective_function_value == mip_optimal_objective);
-  REQUIRE(objectiveOk(mip_optimal_objective, h.getInfo().objective_function_value,
-                      dev_run));
-
+  REQUIRE(objectiveOk(mip_optimal_objective,
+                      h.getInfo().objective_function_value, dev_run));
 
   REQUIRE(h.getFixedLp(fixed_lp) == HighsStatus::kOk);
 

highs/interfaces/highs_c_api.h

@@ -117,21 +117,32 @@ static const char* const kHighsCallbackDataOutPdlpIterationCountName =
     "pdlp_iteration_count";
 static const char* const kHighsCallbackDataOutObjectiveFunctionValueName =
     "objective_function_value";
-static const char* const kHighsCallbackDataOutMipNodeCountName = "mip_node_count";
+static const char* const kHighsCallbackDataOutMipNodeCountName =
+    "mip_node_count";
 static const char* const kHighsCallbackDataOutMipTotalLpIterationsName =
     "mip_total_lp_iterations";
-static const char* const kHighsCallbackDataOutMipPrimalBoundName = "mip_primal_bound";
-static const char* const kHighsCallbackDataOutMipDualBoundName = "mip_dual_bound";
+static const char* const kHighsCallbackDataOutMipPrimalBoundName =
+    "mip_primal_bound";
+static const char* const kHighsCallbackDataOutMipDualBoundName =
+    "mip_dual_bound";
 static const char* const kHighsCallbackDataOutMipGapName = "mip_gap";
 static const char* const kHighsCallbackDataOutMipSolutionName = "mip_solution";
-static const char* const kHighsCallbackDataOutCutpoolNumColName = "cutpool_num_col";
-static const char* const kHighsCallbackDataOutCutpoolNumCutName = "cutpool_num_cut";
-static const char* const kHighsCallbackDataOutCutpoolNumNzName = "cutpool_num_nz";
-static const char* const kHighsCallbackDataOutCutpoolStartName = "cutpool_start";
-static const char* const kHighsCallbackDataOutCutpoolIndexName = "cutpool_index";
-static const char* const kHighsCallbackDataOutCutpoolValueName = "cutpool_value";
-static const char* const kHighsCallbackDataOutCutpoolLowerName = "cutpool_lower";
-static const char* const kHighsCallbackDataOutCutpoolUpperName = "cutpool_upper";
+static const char* const kHighsCallbackDataOutCutpoolNumColName =
+    "cutpool_num_col";
+static const char* const kHighsCallbackDataOutCutpoolNumCutName =
+    "cutpool_num_cut";
+static const char* const kHighsCallbackDataOutCutpoolNumNzName =
+    "cutpool_num_nz";
+static const char* const kHighsCallbackDataOutCutpoolStartName =
+    "cutpool_start";
+static const char* const kHighsCallbackDataOutCutpoolIndexName =
+    "cutpool_index";
+static const char* const kHighsCallbackDataOutCutpoolValueName =
+    "cutpool_value";
+static const char* const kHighsCallbackDataOutCutpoolLowerName =
+    "cutpool_lower";
+static const char* const kHighsCallbackDataOutCutpoolUpperName =
+    "cutpool_upper";
 
 const HighsInt kHighsIisStrategyLight = 0;
 const HighsInt kHighsIisStrategyFromLpRowPriority = 1;  // WIP

highs/mip/HighsMipSolverData.cpp

@@ -357,14 +357,18 @@ void HighsMipSolverData::startAnalyticCenterComputation(
     ipm.setOptionValue("presolve", kHighsOffString);
     // Determine the solver
     const std::string mip_ipm_solver = mipsolver.options_mip_->mip_ipm_solver;
-    // Currently use HiPO by default and take action on failure
-    // here. Later pass mip_ipm_solver and take action on failure in
-    // solveLp
+    // Currently use IPX by default and take action on failure here if
+    // using HiPO.
     bool use_hipo =
-#ifdef HIPO
+        /*
+  #ifdef HIPO
+        // Later use HiPO by default
         mip_ipm_solver == kHighsChooseString ||
-#endif
+  #endif
+        */
         mip_ipm_solver == kHipoString;
+    // Later still, pass mip_ipm_solver and take action on failure in
+    // solveLp
 #ifndef HIPO
     // Shouldn't be possible to choose HiPO if it's not in the build
     assert(!use_hipo);