Only apply bbox pruning for homogeneous vehicle pairs.

VROOM-Project · Oct 20, 2023 · f093c83 · f093c83
1 parent 5ce4813
commit f093c83
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/algorithms/local_search/local_search.cpp b/src/algorithms/local_search/local_search.cpp
@@ -514,6 +514,7 @@ void LocalSearch<Route,
           best_priorities[source] > 0 || best_priorities[target] > 0 ||
           _sol[source].size() < 2 || _sol[target].size() < 2 ||
           (_input.all_locations_have_coords() &&
+           _input.vehicles[source].has_same_profile(_input.vehicles[target]) &&
            !_sol_state.route_bbox[source].intersects(
              _sol_state.route_bbox[target]))) {
         continue;
@@ -653,6 +654,8 @@ void LocalSearch<Route,
             best_priorities[target] > 0 || _sol[source].size() == 0 ||
             _sol[target].size() < 2 ||
             (_input.all_locations_have_coords() &&
+             _input.vehicles[source].has_same_profile(
+               _input.vehicles[target]) &&
              !_sol_state.route_bbox[source].intersects(
                _sol_state.route_bbox[target]))) {
           continue;
@@ -766,6 +769,7 @@ void LocalSearch<Route,
       if (target <= source || // This operator is symmetric.
           best_priorities[source] > 0 || best_priorities[target] > 0 ||
           (_input.all_locations_have_coords() &&
+           _input.vehicles[source].has_same_profile(_input.vehicles[target]) &&
            !_sol_state.route_bbox[source].intersects(
              _sol_state.route_bbox[target]))) {
         continue;
@@ -875,6 +879,7 @@ void LocalSearch<Route,
       if (source == target || best_priorities[source] > 0 ||
           best_priorities[target] > 0 ||
           (_input.all_locations_have_coords() &&
+           _input.vehicles[source].has_same_profile(_input.vehicles[target]) &&
            !_sol_state.route_bbox[source].intersects(
              _sol_state.route_bbox[target]))) {
         continue;
@@ -1633,6 +1638,8 @@ void LocalSearch<Route,
             _sol[source].size() == 0 || _sol[target].size() == 0 ||
             !_input.vehicle_ok_with_vehicle(source, target) ||
             (_input.all_locations_have_coords() &&
+             _input.vehicles[source].has_same_profile(
+               _input.vehicles[target]) &&
              !_sol_state.route_bbox[source].intersects(
                _sol_state.route_bbox[target]))) {
           continue;