Skip to content

Commit d4c1c95

Browse files
committed
work on cp/routing
1 parent 83e80cf commit d4c1c95

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

ortools/constraint_solver/local_search.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1924,7 +1924,7 @@ class NearestNeighbors {
19241924
NearestNeighbors& operator=(const NearestNeighbors&) = delete;
19251925

19261926
virtual ~NearestNeighbors() {}
1927-
void Initialize(const std::vector<int>& path);
1927+
void Initialize(absl::Span<const int> path);
19281928
const std::vector<int>& Neighbors(int index) const;
19291929

19301930
virtual std::string DebugString() const { return "NearestNeighbors"; }
@@ -1945,7 +1945,7 @@ NearestNeighbors::NearestNeighbors(Solver::IndexEvaluator3 evaluator,
19451945
path_operator_(path_operator),
19461946
size_(size) {}
19471947

1948-
void NearestNeighbors::Initialize(const std::vector<int>& path) {
1948+
void NearestNeighbors::Initialize(absl::Span<const int> path) {
19491949
for (int node : path) {
19501950
if (node < path_operator_.number_of_nexts()) ComputeNearest(node, path);
19511951
}

ortools/routing/search.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2543,7 +2543,7 @@ bool LocalCheapestInsertionFilteredHeuristic::OptimizeOnInsertion(
25432543
namespace {
25442544
// Computes the cost from vehicle starts to pickups.
25452545
std::vector<std::vector<int64_t>> ComputeStartToPickupCosts(
2546-
const RoutingModel& model, const std::vector<int64_t>& pickups,
2546+
const RoutingModel& model, absl::Span<const int64_t> pickups,
25472547
const Bitset64<int>& vehicle_set) {
25482548
std::vector<std::vector<int64_t>> pickup_costs(model.Size());
25492549
for (int64_t pickup : pickups) {
@@ -2560,7 +2560,7 @@ std::vector<std::vector<int64_t>> ComputeStartToPickupCosts(
25602560

25612561
// Computes the cost from deliveries to vehicle ends.
25622562
std::vector<std::vector<int64_t>> ComputeDeliveryToEndCosts(
2563-
const RoutingModel& model, const std::vector<int64_t>& deliveries,
2563+
const RoutingModel& model, absl::Span<const int64_t> deliveries,
25642564
const Bitset64<int>& vehicle_set) {
25652565
std::vector<std::vector<int64_t>> delivery_costs(model.Size());
25662566
for (int64_t delivery : deliveries) {
@@ -4822,8 +4822,8 @@ class RouteConstructor {
48224822
enum MergeStatus { FIRST_SECOND, SECOND_FIRST, NO_MERGE };
48234823

48244824
struct RouteSort {
4825-
bool operator()(const std::vector<int>& route1,
4826-
const std::vector<int>& route2) const {
4825+
bool operator()(absl::Span<const int> route1,
4826+
absl::Span<const int> route2) const {
48274827
return (route1.size() < route2.size());
48284828
}
48294829
} RouteComparator;

0 commit comments

Comments
 (0)