Updated OR-Tools to 9.12

Author: ankane

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.15.0 (unreleased)
+
+- Updated OR-Tools to 9.12
+- Removed `pickup_positions` and `pickup_index_pairs` (use `pickup_position` instead)
+- Removed `delivery_positions` and `delivery_index_pairs` (use `delivery_position` instead)
+
 ## 0.14.2 (2025-02-10)
 
 - Fixed error with Rice 4.5

Rakefile

@@ -25,8 +25,8 @@ task :update do
   require "open-uri"
   require "tmpdir"
 
-  version = "9.11.4210"
-  distributions = ["arm64_macOS-14.6.1", "x86_64_macOS-14.6.1", "amd64_ubuntu-24.04", "amd64_ubuntu-22.04", "amd64_ubuntu-20.04", "amd64_debian-11", "amd64_debian-12", "amd64_archlinux"]
+  version = "9.12.4544"
+  distributions = ["arm64_macOS-15.3.1", "x86_64_macOS-15.3.1", "amd64_ubuntu-24.04", "amd64_ubuntu-22.04", "amd64_ubuntu-20.04", "amd64_debian-11", "amd64_debian-12", "amd64_archlinux"]
 
   short_version = version.split(".").first(2).join(".")
   distributions.each do |dist|
@@ -42,3 +42,5 @@ task :update do
     puts "#{dist}: #{Digest::SHA256.file(dest).hexdigest}"
   end
 end
+
+CLEAN.add("tmp")

ext/or-tools/extconf.rb

@@ -1,6 +1,6 @@
 require "mkmf-rice"
 
-$CXXFLAGS << " -std=c++17 $(optflags) -DUSE_CBC"
+$CXXFLAGS << " -std=c++17 $(optflags) -DUSE_CBC -DOR_PROTO_DLL="
 
 # show warnings
 $CXXFLAGS << " -Wall -Wextra"
@@ -32,10 +32,7 @@
 # find_header and find_library first check without adding path
 # which can cause them to find system library
 $INCFLAGS << " -I#{inc}"
-# could support shared libraries for protobuf and abseil
-# but keep simple for now
-raise "libprotobuf.a not found" unless File.exist?("#{lib}/libprotobuf.a")
-$LDFLAGS.prepend("-Wl,-rpath,#{rpath} -L#{lib} #{lib}/libprotobuf.a ")
+$LDFLAGS.prepend("-Wl,-rpath,#{rpath} -L#{lib} ")
 raise "OR-Tools not found" unless have_library("ortools")
 
 create_makefile("or_tools/ext")

ext/or-tools/routing.cpp

@@ -15,6 +15,7 @@ using operations_research::RoutingModel;
 using operations_research::RoutingModelParameters;
 using operations_research::RoutingNodeIndex;
 using operations_research::RoutingSearchParameters;
+using operations_research::RoutingSearchStatus;
 
 using Rice::Array;
 using Rice::Class;
@@ -331,7 +332,7 @@ void init_routing(Rice::Module& m) {
     .define_method("add_resource_group", &RoutingModel::AddResourceGroup)
     .define_method("dimension_resource_group_indices", &RoutingModel::GetDimensionResourceGroupIndices)
     .define_method("dimension_resource_group_index", &RoutingModel::GetDimensionResourceGroupIndex)
-    .define_method("add_disjunction", &RoutingModel::AddDisjunction, Rice::Arg("_indices"), Rice::Arg("_penalty"), Rice::Arg("_max_cardinality") = (int64_t)1)
+    .define_method("add_disjunction", &RoutingModel::AddDisjunction, Rice::Arg("_indices"), Rice::Arg("_penalty"), Rice::Arg("_max_cardinality") = (int64_t)1, Rice::Arg("_penalty_cost_behavior") = RoutingModel::PenaltyCostBehavior::PENALIZE_ONCE)
     .define_method("disjunction_indices", &RoutingModel::GetDisjunctionIndices)
     .define_method("disjunction_penalty", &RoutingModel::GetDisjunctionPenalty)
     .define_method("disjunction_max_cardinality", &RoutingModel::GetDisjunctionMaxCardinality)
@@ -346,22 +347,14 @@ void init_routing(Rice::Module& m) {
     .define_method("add_pickup_and_delivery", &RoutingModel::AddPickupAndDelivery)
     .define_method("add_pickup_and_delivery_sets", &RoutingModel::AddPickupAndDeliverySets)
     .define_method(
-      "pickup_positions",
+      "pickup_position",
       [](RoutingModel& self, int64_t node_index) {
-        std::vector<std::pair<int, int>> positions;
-        for (const auto& v : self.GetPickupPositions(node_index)) {
-          positions.emplace_back(v.pd_pair_index, v.alternative_index);
-        }
-        return positions;
+        return self.GetPickupPosition(node_index);
       })
     .define_method(
-      "delivery_positions",
+      "delivery_position",
       [](RoutingModel& self, int64_t node_index) {
-        std::vector<std::pair<int, int>> positions;
-        for (const auto& v : self.GetDeliveryPositions(node_index)) {
-          positions.emplace_back(v.pd_pair_index, v.alternative_index);
-        }
-        return positions;
+        return self.GetDeliveryPosition(node_index);
       })
     .define_method("num_of_singleton_nodes", &RoutingModel::GetNumOfSingletonNodes)
     .define_method("unperformed_penalty", &RoutingModel::UnperformedPenalty)
@@ -403,15 +396,15 @@ void init_routing(Rice::Module& m) {
       [](RoutingModel& self) {
         auto status = self.status();
 
-        if (status == RoutingModel::ROUTING_NOT_SOLVED) {
+        if (status == RoutingSearchStatus::ROUTING_NOT_SOLVED) {
           return Symbol("not_solved");
-        } else if (status == RoutingModel::ROUTING_SUCCESS) {
+        } else if (status == RoutingSearchStatus::ROUTING_SUCCESS) {
           return Symbol("success");
-        } else if (status == RoutingModel::ROUTING_FAIL) {
+        } else if (status == RoutingSearchStatus::ROUTING_FAIL) {
           return Symbol("fail");
-        } else if (status == RoutingModel::ROUTING_FAIL_TIMEOUT) {
+        } else if (status == RoutingSearchStatus::ROUTING_FAIL_TIMEOUT) {
           return Symbol("fail_timeout");
-        } else if (status == RoutingModel::ROUTING_INVALID) {
+        } else if (status == RoutingSearchStatus::ROUTING_INVALID) {
           return Symbol("invalid");
         } else {
           throw std::runtime_error("Unknown solver status");

ext/or-tools/vendor.rb

@@ -3,18 +3,18 @@
 require "net/http"
 require "tmpdir"
 
-version = "9.11.4210"
+version = "9.12.4544"
 
 arch = RbConfig::CONFIG["host_cpu"]
 arm = arch.match?(/arm|aarch64/i)
 
 if RbConfig::CONFIG["host_os"].match?(/darwin/i)
   if arm
-    filename = "or-tools_arm64_macOS-14.6.1_cpp_v#{version}.tar.gz"
-    checksum = "a106668eb1975c1672874ef24b4f8e2e56669467a63349e5ea8ef5419814c31b"
+    filename = "or-tools_arm64_macOS-15.3.1_cpp_v#{version}.tar.gz"
+    checksum = "02f89e54bd8d86e6e069f843aeed10a444ff329052e5a7fd732c5e4ec4f845fb"
   else
-    filename = "or-tools_x86_64_macOS-14.6.1_cpp_v#{version}.tar.gz"
-    checksum = "cc87a7f8c68ec4fed6c6de6565b0b625f2f0047185a8a4449ef4b5a305b60e55"
+    filename = "or-tools_x86_64_macOS-15.3.1_cpp_v#{version}.tar.gz"
+    checksum = "515af60e73e7fa620bab7f4a7d60b9069075d814453d91906aa39993d714f28d"
   end
 else
   # try /etc/os-release with fallback to /usr/lib/os-release
@@ -29,22 +29,22 @@
 
   if os == "ubuntu" && os_version == "24.04" && !arm
     filename = "or-tools_amd64_ubuntu-24.04_cpp_v#{version}.tar.gz"
-    checksum = "71761d93171b111fca736647a6cd00cb9e606474df597a8b48f3f5f2c73d4c0f"
+    checksum = "71128e095024707bf9835faf4558cbe34acb79345e899bd532f3008a493a8970"
   elsif os == "ubuntu" && os_version == "22.04" && !arm
     filename = "or-tools_amd64_ubuntu-22.04_cpp_v#{version}.tar.gz"
-    checksum = "f613574d4eae01afd966c8bde199990cbd9fad46035e675d71f17f5c7477eed4"
+    checksum = "cb42ea7d7799a01fea7cdaafacbdfc67180d85f39532c6d2a8c4cfb419bd07ed"
   elsif os == "ubuntu" && os_version == "20.04" && !arm
     filename = "or-tools_amd64_ubuntu-20.04_cpp_v#{version}.tar.gz"
-    checksum = "190b85f4510cab55fcb50b9850a0e2f94b2bdf5e266580650efbc5aaab760683"
+    checksum = "ea51589fe80bd9cd4fb6203bd1e956b311cdb1d21bbd14f7b6dad75c81d3583c"
   elsif os == "debian" && os_version == "11" && !arm
     filename = "or-tools_amd64_debian-11_cpp_v#{version}.tar.gz"
-    checksum = "a8354696f365aa13a2375da5f8f6cfd8785430681addcd887bfd194851dd4710"
+    checksum = "dcee63b726569bd99c134e0e920173f955feae5856c3370a0bed03fdc995af50"
   elsif os == "debian" && os_version == "12" && !arm
     filename = "or-tools_amd64_debian-12_cpp_v#{version}.tar.gz"
-    checksum = "9fda332f2f9d3b5647d85dd65de145ea3e2a1543714bf588f82da8ec57721cbf"
+    checksum = "911143f50fe013fbd50d0dce460512106596adfc0f2ad9a2bc8afd218531bde4"
   elsif os == "arch" && !arm
     filename = "or-tools_amd64_archlinux_cpp_v#{version}.tar.gz"
-    checksum = "ac892a949d871294b7e26b0730440ab8629b4021bf3c1641bc7c8fb09b45081f"
+    checksum = "18c1d929e2144e9d9602659ea2fa790bd2a150f72c32c38a97f571839816d132"
   else
     platform =
       if Gem.win_platform?
@@ -139,16 +139,7 @@ def download_file(url, download_path, redirects = 0)
   FileUtils.cp_r(File.join(extract_path, "include"), File.join(path, "include"))
 
   # shared library
-  FileUtils.mkdir(File.join(path, "lib"))
-  Dir.glob("lib/libortools.{9.dylib,so.9}", base: extract_path) do |file|
-    so_path = File.join(path, file)
-    FileUtils.cp(File.join(extract_path, file), so_path)
-    ext = file.end_with?(".dylib") ? "dylib" : "so"
-    File.symlink(so_path, File.join(path, "lib/libortools.#{ext}"))
-  end
-  ["lib/libprotobuf.a"].each do |file|
-    FileUtils.cp(File.join(extract_path, file), File.join(path, file))
-  end
+  FileUtils.cp_r(File.join(extract_path, "lib"), File.join(path, "lib"))
 end
 
 # export

lib/or_tools/routing_model.rb

@@ -13,9 +13,5 @@ def solve(solution_limit: nil, time_limit: nil, lns_time_limit: nil,
       search_parameters.log_search = log_search unless log_search.nil?
       solve_with_parameters(search_parameters)
     end
-
-    # previous names
-    alias_method :pickup_index_pairs, :pickup_positions
-    alias_method :delivery_index_pairs, :delivery_positions
   end
 end

test/constraint_test.rb

@@ -153,8 +153,8 @@ def test_cryptoarithmetic
     status = solver.solve(model, solution_printer)
     assert_equal :optimal, status
 
-    assert_equal 186, solver.num_conflicts
-    assert_equal 1577, solver.num_branches
+    assert_equal 184, solver.num_conflicts
+    assert_equal 1850, solver.num_branches
     assert_equal 72, solution_printer.solution_count
   end
 
@@ -267,6 +267,8 @@ def test_sum_empty_false
     model.add([].sum > 2)
     expected = <<~EOS
       constraints {
+        bool_or {
+        }
       }
     EOS
     assert_equal expected, model.inspect