fix race and subsequent crash

google · Aug 3, 2023 · 8d44f5f · 8d44f5f
1 parent ae1f0ea
commit 8d44f5f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/ortools/sat/cp_model_lns.cc b/ortools/sat/cp_model_lns.cc
@@ -2028,21 +2028,19 @@ Neighborhood SchedulingTimeWindowNeighborhoodGenerator::Generate(
 Neighborhood SchedulingResourceWindowsNeighborhoodGenerator::Generate(
     const CpSolverResponse& initial_solution, double difficulty,
     absl::BitGenRef random) {
-  intervals_to_relax_.clear();
+  std::vector<int> intervals_to_relax;
   for (const std::vector<int>& intervals : intervals_in_constraints_) {
     const std::vector<int> selected_indices = SelectIndicesInRandomTimeWindow(
         intervals, helper_.ModelProto(), initial_solution, difficulty, random);
     for (const int index : selected_indices) {
-      intervals_to_relax_.insert(intervals[index]);
+      intervals_to_relax.push_back(intervals[index]);
     }
   }
 
-  if (intervals_to_relax_.empty()) return helper_.FullNeighborhood();
-
-  const std::vector<int> intervals(
-      {intervals_to_relax_.begin(), intervals_to_relax_.end()});
+  if (intervals_to_relax.empty()) return helper_.FullNeighborhood();
+  gtl::STLSortAndRemoveDuplicates(&intervals_to_relax);
   return GenerateSchedulingNeighborhoodFromRelaxedIntervals(
-      intervals, initial_solution, random, helper_);
+      intervals_to_relax, initial_solution, random, helper_);
 }
 
 Neighborhood RandomRectanglesPackingNeighborhoodGenerator::Generate(

diff --git a/ortools/sat/cp_model_lns.h b/ortools/sat/cp_model_lns.h
@@ -679,7 +679,6 @@ class SchedulingResourceWindowsNeighborhoodGenerator
 
  private:
   const std::vector<std::vector<int>> intervals_in_constraints_;
-  absl::flat_hash_set<int> intervals_to_relax_;
 };
 
 // Only make sense for problems with no_overlap_2d constraints. This select a