update constraint_solver from google3

google · Oct 9, 2023 · 753a7ab · 753a7ab
1 parent 524b33c
commit 753a7ab
Show file tree

Hide file tree

Showing 4 changed files with 253 additions and 141 deletions.
diff --git a/ortools/constraint_solver/python/pywrapcp_test.py b/ortools/constraint_solver/python/pywrapcp_test.py
@@ -877,7 +877,7 @@ class SumFilter(pywrapcp.IntVarLocalSearchFilter):
         """Filter to speed up LS computation."""
 
         def __init__(self, int_vars):
-            pywrapcp.IntVarLocalSearchFilter.__init__(self, int_vars)
+            super.__init__(int_vars)
             self.__sum = 0
 
         def OnSynchronize(self, delta):

diff --git a/ortools/constraint_solver/routing.h b/ortools/constraint_solver/routing.h
@@ -907,6 +907,13 @@ class RoutingModel {
   const std::vector<std::pair<int, int> >&
       GetDeliveryIndexPairs(int64_t node_index) const;
   // clang-format on
+  /// Returns whether the node is a pickup (resp. delivery).
+  bool IsPickup(int64_t node_index) const {
+    return !GetPickupIndexPairs(node_index).empty();
+  }
+  bool IsDelivery(int64_t node_index) const {
+    return !GetDeliveryIndexPairs(node_index).empty();
+  }
 
   /// Sets the Pickup and delivery policy of all vehicles. It is equivalent to
   /// calling SetPickupAndDeliveryPolicyOfVehicle on all vehicles.