Merge branch 'enhance/heuristic-sync'

VROOM-Project · Dec 10, 2024 · 2418e9d · 2418e9d
2 parents 82327fe + 888cdc7
commit 2418e9d
Show file tree

Hide file tree

Showing 13 changed files with 282 additions and 242 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
 #### Internals
 
 - Bypass matrix request in `plan` mode (#444)
+- Account for heuristic time in timeout (#1196)
 - Refactor heuristics to reduce code duplication (#1181)
 - Refactor `Matrix` template class (#1089)
 - Refactor to use `std::format` whenever possible (#1081)
@@ -22,6 +23,8 @@
 - Remove amount consistency checks in `parse` in favor of upstream checks in `Input` (#1086)
 - Reduce code duplication in routing wrappers (#1184)
 - Allow passing `path` in `Server` ctor (#1192)
+- Refactor to simplify `VRP::solve` (#1196)
+- Remove heuristic synchronisation (#1188)
 
 #### CI
 

diff --git a/src/algorithms/heuristics/heuristics.cpp b/src/algorithms/heuristics/heuristics.cpp
@@ -719,14 +719,11 @@ void set_route(const Input& input,
 }
 
 template <class Route>
-std::unordered_set<Index> set_initial_routes(const Input& input,
-                                             std::vector<Route>& routes) {
-  std::unordered_set<Index> assigned;
-
+void set_initial_routes(const Input& input,
+                        std::vector<Route>& routes,
+                        std::unordered_set<Index>& assigned) {
   std::ranges::for_each(routes,
                         [&](auto& r) { set_route(input, r, assigned); });
-
-  return assigned;
 }
 
 using RawSolution = std::vector<RawRoute>;
@@ -748,8 +745,9 @@ template Eval dynamic_vehicle_choice(const Input& input,
                                      double lambda,
                                      SORT sort);
 
-template std::unordered_set<Index> set_initial_routes(const Input& input,
-                                                      RawSolution& routes);
+template void set_initial_routes(const Input& input,
+                                 RawSolution& routes,
+                                 std::unordered_set<Index>& assigned);
 
 template Eval basic(const Input& input,
                     TWSolution& routes,
@@ -767,7 +765,8 @@ template Eval dynamic_vehicle_choice(const Input& input,
                                      double lambda,
                                      SORT sort);
 
-template std::unordered_set<Index> set_initial_routes(const Input& input,
-                                                      TWSolution& routes);
+template void set_initial_routes(const Input& input,
+                                 TWSolution& routes,
+                                 std::unordered_set<Index>& assigned);
 
 } // namespace vroom::heuristics
diff --git a/src/algorithms/heuristics/heuristics.h b/src/algorithms/heuristics/heuristics.h
@@ -40,8 +40,9 @@ Eval dynamic_vehicle_choice(const Input& input,
 
 // Populate routes with user-defined vehicle steps.
 template <class Route>
-std::unordered_set<Index> set_initial_routes(const Input& input,
-                                             std::vector<Route>& routes);
+void set_initial_routes(const Input& input,
+                        std::vector<Route>& routes,
+                        std::unordered_set<Index>& assigned);
 
 } // namespace vroom::heuristics
 

diff --git a/src/algorithms/local_search/local_search.cpp b/src/algorithms/local_search/local_search.cpp
@@ -1923,14 +1923,6 @@ void LocalSearch<Route,
                  TSPFix>::run() {
   bool try_ls_step = true;
 
-#ifdef LOG_LS
-  steps.emplace_back(utils::now(),
-                     log::EVENT::START,
-                     OperatorName::MAX,
-                     _best_sol_indicators,
-                     utils::format_solution(_input, _best_sol));
-#endif
-
   while (try_ls_step) {
     // A round of local search.
     run_ls_step();

diff --git a/src/algorithms/local_search/log_local_search.h b/src/algorithms/local_search/log_local_search.h
@@ -17,6 +17,7 @@ namespace vroom::ls::log {
 
 enum class EVENT {
   START,
+  HEURISTIC,
   OPERATOR,
   LOCAL_MINIMA,
   JOB_ADDITION,

diff --git a/src/problems/cvrp/cvrp.cpp b/src/problems/cvrp/cvrp.cpp
@@ -143,9 +143,9 @@ const std::vector<HeuristicParameters> CVRP::heterogeneous_parameters =
 CVRP::CVRP(const Input& input) : VRP(input) {
 }
 
-Solution CVRP::solve(unsigned nb_searches,
-                     unsigned depth,
-                     unsigned nb_threads,
+Solution CVRP::solve(const unsigned nb_searches,
+                     const unsigned depth,
+                     const unsigned nb_threads,
                      const Timeout& timeout,
                      const std::vector<HeuristicParameters>& h_param) const {
   if (_input.vehicles.size() == 1 && !_input.has_skills() &&

diff --git a/src/problems/cvrp/cvrp.h b/src/problems/cvrp/cvrp.h
@@ -25,9 +25,9 @@ class CVRP : public VRP {
   explicit CVRP(const Input& input);
 
   Solution
-  solve(unsigned nb_searches,
-        unsigned depth,
-        unsigned nb_threads,
+  solve(const unsigned nb_searches,
+        const unsigned depth,
+        const unsigned nb_threads,
         const Timeout& timeout,
         const std::vector<HeuristicParameters>& h_param) const override;
 };