always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ortools: export from google3

Browse Source
This commit is contained in:
Corentin Le Molgat
2025-08-08 15:03:52 +02:00
parent badef91fb5
commit bd641e14b9
9 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ortools/constraint_solver/constraint_solver.h
View File

@@ -5074,6 +5074,7 @@ class SequenceVar : public PropagationBaseObject {
class AssignmentElement {
public:
AssignmentElement() : activated_(true) {}
AssignmentElement(const AssignmentElement&) = default;
void Activate() { activated_ = true; }
void Deactivate() { activated_ = false; }
@@ -5087,6 +5088,7 @@ class IntVarElement : public AssignmentElement {
public:
IntVarElement();
explicit IntVarElement(IntVar* var);
IntVarElement(const IntVarElement& element) = default;
void Reset(IntVar* var);
IntVarElement* Clone();
void Copy(const IntVarElement& element);
@@ -5351,9 +5353,8 @@ class AssignmentContainer {
/// previous content.
void Copy(const AssignmentContainer<V, E>& container) {
Clear();
for (int i = 0; i < container.elements_.size(); ++i) {
const E& element = container.elements_[i];
FastAdd(element.Var())->Copy(element);
for (const E& element : container.elements_) {
elements_.emplace_back(element);
}
}
bool Contains(const V* const var) const {

4
ortools/constraint_solver/routing_search.cc
View File

@@ -2481,7 +2481,7 @@ void GlobalCheapestInsertionFilteredHeuristic::AddNodeEntry(
}
void InsertionSequenceGenerator::AppendPickupDeliveryMultitourInsertions(
int pickup, int delivery, int vehicle, const std::vector<int>& path,
int pickup, int delivery, int vehicle, absl::Span<const int> path,
const std::vector<bool>& path_node_is_pickup,
const std::vector<bool>& path_node_is_delivery,
InsertionSequenceContainer& insertions) {
@@ -2514,7 +2514,7 @@ void InsertionSequenceGenerator::AppendPickupDeliveryMultitourInsertions(
}
}
auto append = [pickup, delivery, vehicle, num_nodes, &path, &insertions](
auto append = [pickup, delivery, vehicle, num_nodes, path, &insertions](
int pickup_pos, int delivery_pos) {
if (pickup_pos < 0 || num_nodes - 1 <= pickup_pos) return;
if (delivery_pos < 0 || num_nodes - 1 <= delivery_pos) return;

2
ortools/constraint_solver/routing_search.h
View File

@@ -1099,7 +1099,7 @@ class InsertionSequenceGenerator {
/// are made on the subpath of paired nodes, all extensions to the original
/// path that conserve order are equivalent.
void AppendPickupDeliveryMultitourInsertions(
int pickup, int delivery, int vehicle, const std::vector<int>& path,
int pickup, int delivery, int vehicle, absl::Span<const int> path,
const std::vector<bool>& path_node_is_pickup,
const std::vector<bool>& path_node_is_delivery,
InsertionSequenceContainer& insertions);