re-enable test and fix cut aging

Author: Opt-Mucca

check/TestCallbacks.cpp

@@ -429,46 +429,46 @@ TEST_CASE("highs-callback-mip-cut-pool", "[highs_callback]") {
   highs.resetGlobalScheduler(true);
 }
 
-// TEST_CASE("highs-callback-mip-user-solution", "[highs_callback]") {
-//   //  const std::vector<std::string> model = {"rgn", "flugpl", "gt2", "egout",
-//   //  "bell5", "lseu", "sp150x300d"};//, "p0548", "dcmulti"}; const
-//   //  std::vector<HighsInt> require_origin = {0, 1, 2, 3, 4, 5, 6};
-//   const std::vector<std::string> model = {"p0548", "flugpl", "gt2", "egout",
-//                                           "sp150x300d"};
-//   const std::vector<HighsInt> require_origin = {0, 1, 2, 3, 4};  //, 4, 5, 6};
-//   assert(model.size() == require_origin.size());
-//   Highs highs;
-//   highs.setOptionValue("output_flag", dev_run);
-//   highs.setOptionValue("mip_rel_gap", 0);
-//   HighsInt from_model = 0;
-//   HighsInt to_model = HighsInt(model.size());
-//   for (HighsInt iModel = from_model; iModel < to_model; iModel++) {
-//     const std::string filename =
-//         std::string(HIGHS_DIR) + "/check/instances/" + model[iModel] + ".mps";
-//     highs.readModel(filename);
-//     highs.run();
-//     std::vector<double> optimal_solution = highs.getSolution().col_value;
-//     double objective_function_value0 = highs.getInfo().objective_function_value;
-//     highs.clearSolver();
-
-//     UserMipSolution user_callback_data;
-//     user_callback_data.optimal_objective_value = objective_function_value0;
-//     user_callback_data.optimal_solution = optimal_solution.data();
-//     user_callback_data.require_user_solution_callback_origin =
-//         require_origin[iModel];
-//     void* p_user_callback_data = (void*)(&user_callback_data);
-
-//     //  highs.setOptionValue("presolve", kHighsOffString);
-//     highs.setCallback(userkMipUserSolution, p_user_callback_data);
-//     highs.startCallback(kCallbackMipUserSolution);
-//     highs.run();
-//     highs.stopCallback(kCallbackMipUserSolution);
-//     double objective_function_value1 = highs.getInfo().objective_function_value;
-//     double objective_diff =
-//         std::fabs(objective_function_value1 - objective_function_value0) /
-//         std::max(1.0, std::fabs(objective_function_value0));
-//     REQUIRE(objective_diff < 1e-12);
-//   }
-
-//   highs.resetGlobalScheduler(true);
-// }
+TEST_CASE("highs-callback-mip-user-solution", "[highs_callback]") {
+  //  const std::vector<std::string> model = {"rgn", "flugpl", "gt2", "egout",
+  //  "bell5", "lseu", "sp150x300d"};//, "p0548", "dcmulti"}; const
+  //  std::vector<HighsInt> require_origin = {0, 1, 2, 3, 4, 5, 6};
+  const std::vector<std::string> model = {"p0548", "flugpl", "gt2", "egout",
+                                          "sp150x300d"};
+  const std::vector<HighsInt> require_origin = {0, 1, 2, 3, 4};  //, 4, 5, 6};
+  assert(model.size() == require_origin.size());
+  Highs highs;
+  highs.setOptionValue("output_flag", dev_run);
+  highs.setOptionValue("mip_rel_gap", 0);
+  HighsInt from_model = 0;
+  HighsInt to_model = HighsInt(model.size());
+  for (HighsInt iModel = from_model; iModel < to_model; iModel++) {
+    const std::string filename =
+        std::string(HIGHS_DIR) + "/check/instances/" + model[iModel] + ".mps";
+    highs.readModel(filename);
+    highs.run();
+    std::vector<double> optimal_solution = highs.getSolution().col_value;
+    double objective_function_value0 = highs.getInfo().objective_function_value;
+    highs.clearSolver();
+
+    UserMipSolution user_callback_data;
+    user_callback_data.optimal_objective_value = objective_function_value0;
+    user_callback_data.optimal_solution = optimal_solution.data();
+    user_callback_data.require_user_solution_callback_origin =
+        require_origin[iModel];
+    void* p_user_callback_data = (void*)(&user_callback_data);
+
+    //  highs.setOptionValue("presolve", kHighsOffString);
+    highs.setCallback(userkMipUserSolution, p_user_callback_data);
+    highs.startCallback(kCallbackMipUserSolution);
+    highs.run();
+    highs.stopCallback(kCallbackMipUserSolution);
+    double objective_function_value1 = highs.getInfo().objective_function_value;
+    double objective_diff =
+        std::fabs(objective_function_value1 - objective_function_value0) /
+        std::max(1.0, std::fabs(objective_function_value0));
+    REQUIRE(objective_diff < 1e-12);
+  }
+
+  highs.resetGlobalScheduler(true);
+}

highs/mip/HighsCutPool.cpp

@@ -148,8 +148,8 @@ double HighsCutPool::getParallelism(HighsInt row1, HighsInt row2,
 }
 
 void HighsCutPool::lpCutRemoved(HighsInt cut, bool thread_safe) {
-  numLps_[cut].fetch_add(-1, std::memory_order_relaxed);
-  if (thread_safe) return;
+  const HighsInt n = numLps_[cut].fetch_add(-1, std::memory_order_relaxed);
+  if (thread_safe || n > 1) return;
   if (matrix_.columnsLinked(cut)) {
     propRows.erase(std::make_pair(ages_[cut], cut));
     propRows.emplace(1, cut);
@@ -287,7 +287,7 @@ void HighsCutPool::separate(const std::vector<double>& sol, HighsDomain& domain,
 
         matrix_.removeRow(i);
         ages_[i] = -1;
-        rhs_[i] = 0;
+        rhs_[i] = kHighsInf;
         usedInRound_[i] = false;
         hasSynced_[i] = false;
         auto range = hashToCutMap.equal_range(h);