or-tools 0.10.1 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c2f60a5c859f2659349bfb6f77336d2078f8d8747b76fcd8e3e10e7cfb25e28
-  data.tar.gz: a8d18cf5002f42735d1e458451f7902909ad7e552ed78e77ef52477108bbed16
+  metadata.gz: db5ea336dfbb4e2a150736473ff1e51cbd125976ea287a130b95316d81b438b2
+  data.tar.gz: 2998d8aefe52396ebabe019d5093343980c785c2735ae3f1396d884000f9cc1c
 SHA512:
-  metadata.gz: 7394863f44908fcadda86df82fa469c69e6178cdc376db90cc2a1d1142738af7f60b22eb0d66ad252ff1c8fd4a93d169194b462973ce158797519d0b5bb8a5dc
-  data.tar.gz: c8b8ca7f9f0c78e2dbf88555f23d5463e0b281e65afd83ebcd581062203d8b348aa76acf87f0bb55fef5736882cea48e33cd9a6f801addc60e80de9051b7fcf8
+  metadata.gz: 25a64519e5ca3ec8e2746369e54f234961022da4bad42283e76ad323b9e39218683d0e1831a7e79bb46237966674f1729b46e50c894f435dceee438bdd1e6aee
+  data.tar.gz: 47c5ae441d52e4e84bb2f1efcb97b1f9b0786870fb6f6ddb87b6e115a1ab337453c1550b3bed3d4a3558393f250b37367653104a31ea1fbb57fe6f290ac37f86

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.11.1 (2023-12-04)
+
+- Added binary installation for Arch Linux
+- Added binary installation for Debian 11 ARM
+
+## 0.11.0 (2023-11-16)
+
+- Updated OR-Tools to 9.8
+- Dropped support for Ubuntu 18.04, Debian 10, and CentOS 8
+- Dropped support for Ruby < 3
+
 ## 0.10.1 (2023-03-20)
 
 - Added `domain` method to `SatIntVar`

data/README.md

@@ -1607,6 +1607,8 @@ end
 solver.minimize(data[:bins].sum { |j| y[j] })
 
 # call the solver and print the solution
+status = solver.solve
+
 if status == :optimal
   num_bins = 0
   data[:bins].each do |j|

data/ext/or-tools/constraint.cpp

@@ -152,6 +152,14 @@ void init_constraint(Rice::Module& m) {
       "enumerate_all_solutions",
       [](SatParameters& self) {
         return self.enumerate_all_solutions();
+       })
+    .define_method("num_workers=",
+      [](SatParameters& self, int32_t value){
+        self.set_num_workers(value);
+      })
+    .define_method("cp_model_presolve=",
+      [](SatParameters& self, bool value) {
+        self.set_cp_model_presolve(value);
       });
 
   Rice::define_class_under<CpModelBuilder>(m, "CpModel")
@@ -408,10 +416,13 @@ void init_constraint(Rice::Module& m) {
           parameters.set_num_search_workers(1);
 
           m.Add(NewFeasibleSolutionObserver(
-            [callback](const CpSolverResponse& r) {
-              // TODO find a better way to do this
-              callback.call("response=", r);
-              callback.call("on_solution_callback");
+            [&callback](const CpSolverResponse& r) {
+              // ensure Ruby thread
+              if (ruby_native_thread_p()) {
+                // TODO find a better way to do this
+                callback.call("response=", r);
+                callback.call("on_solution_callback");
+              }
             })
           );
         }

data/ext/or-tools/extconf.rb

@@ -26,7 +26,10 @@ end
 # find_header and find_library first check without adding path
 # which can cause them to find system library
 $INCFLAGS << " -I#{inc}"
-$LDFLAGS.prepend("-Wl,-rpath,#{rpath} -L#{lib} ")
+# 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 ")
 raise "OR-Tools not found" unless have_library("ortools")
 
 create_makefile("or_tools/ext")

data/ext/or-tools/routing.cpp

@@ -353,8 +353,24 @@ void init_routing(Rice::Module& m) {
     .define_method("vehicle_allowed_for_index?", &RoutingModel::IsVehicleAllowedForIndex)
     .define_method("add_pickup_and_delivery", &RoutingModel::AddPickupAndDelivery)
     .define_method("add_pickup_and_delivery_sets", &RoutingModel::AddPickupAndDeliverySets)
-    .define_method("pickup_index_pairs", &RoutingModel::GetPickupIndexPairs)
-    .define_method("delivery_index_pairs", &RoutingModel::GetDeliveryIndexPairs)
+    .define_method(
+      "pickup_positions",
+      [](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;
+      })
+    .define_method(
+      "delivery_positions",
+      [](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;
+      })
     // TODO SetPickupAndDeliveryPolicyOfAllVehicles
     // TODO SetPickupAndDeliveryPolicyOfVehicle
     // TODO GetPickupAndDeliveryPolicyOfVehicle

data/ext/or-tools/vendor.rb

@@ -4,15 +4,18 @@ require "fileutils"
 require "net/http"
 require "tmpdir"
 
-version = "9.6.2534"
+version = "9.8.3296"
+
+arch = RbConfig::CONFIG["host_cpu"]
+arm = arch =~ /arm|aarch64/i
 
 if RbConfig::CONFIG["host_os"] =~ /darwin/i
-  if RbConfig::CONFIG["host_cpu"] =~ /arm|aarch64/i
-    filename = "or-tools_arm64_macOS-13.2.1_cpp_v#{version}.tar.gz"
-    checksum = "bb82c3b071e8ea5366a52137f400b280120221611758e38bf3d55c819f81c34b"
+  if arm
+    filename = "or-tools_arm64_macOS-14.1_cpp_v#{version}.tar.gz"
+    checksum = "253efad127c55b78967e3e3a3b4a573f9da0a2562c4f33f14fbf462ca58448f7"
   else
-    filename = "or-tools_x86_64_macOS-13.2.1_cpp_v#{version}.tar.gz"
-    checksum = "0957ed39792d5f6135edf86ed75e78fff5b2f36ec0ae63e30c46bd6a6a97797f"
+    filename = "or-tools_x86_64_macOS-14.1_cpp_v#{version}.tar.gz"
+    checksum = "fe48b022799c807baba79a2b13c29bf9d9614827ba082fc688559d0cab879a86"
   end
 else
   # try /etc/os-release with fallback to /usr/lib/os-release
@@ -25,33 +28,30 @@ else
   os = os_info["ID"]
   os_version = os_info["VERSION_ID"]
 
-  if os == "ubuntu" && os_version == "22.04"
+  if os == "ubuntu" && os_version == "22.04" && !arm
     filename = "or-tools_amd64_ubuntu-22.04_cpp_v#{version}.tar.gz"
-    checksum = "e7960113b156b13e23a179ca09646845e762f452aa525bf9b12a40e5ae3c6ca4"
-  elsif os == "ubuntu" && os_version == "20.04"
+    checksum = "2a332e95897ac6fc2cfd0122bcbc07cfd286d0f579111529cc99ac3076f5421a"
+  elsif os == "ubuntu" && os_version == "20.04" && !arm
     filename = "or-tools_amd64_ubuntu-20.04_cpp_v#{version}.tar.gz"
-    checksum = "aff9714ee8ffd1c936024d6a754f697cf80d4fd5aafa4cf121a4dde114f3813f"
-  elsif os == "ubuntu" && os_version == "18.04"
-    filename = "or-tools_amd64_ubuntu-18.04_cpp_v#{version}.tar.gz"
-    checksum = "467713721be3fdc709cc7fd0c8d6ad99dda73cab1b9c5de3568336c6ebef6473"
-  elsif os == "debian" && os_version == "11"
+    checksum = "95789f8d93dfb298efecd1c0b888f9a148c011e1a20505b00c38452d68b01644"
+  elsif os == "debian" && os_version == "11" && !arm
     filename = "or-tools_amd64_debian-11_cpp_v#{version}.tar.gz"
-    checksum = "4191e3e910156d6e9d6e69fb9ab6ed57c683f018b218b46cce91c7ece6549dc6"
-  elsif os == "debian" && os_version == "10"
-    filename = "or-tools_amd64_debian-10_cpp_v#{version}.tar.gz"
-    checksum = "f141f16cf92877ed5819e0104126a31c9c139c070de06d7f40c957a4e6ce9284"
-  elsif os == "centos" && os_version == "8"
-    filename = "or-tools_amd64_centos-8_cpp_v#{version}.tar.gz"
-    checksum = "05e2dfc5c82d5122e0c26ce4548cddcae2d474b3b18c024bc189dab887357157"
-  elsif os == "centos" && os_version == "7"
+    checksum = "e7dd81b13c53c739447254b8836ece55f8b92a107688cc9f3511705c9962fa2d"
+  elsif os == "debian" && os_version == "11" && arm
+    filename = "or-tools_arm64_debian-11_cpp_v#{version}.tar.gz"
+    checksum = "77a88d01eb612ffac0f6e030e30e58a3d171fe75d93a527ec55a06f9070332ab"
+  elsif os == "centos" && os_version == "7" && !arm
     filename = "or-tools_amd64_centos-7_cpp_v#{version}.tar.gz"
-    checksum = "96012ac1280a98d6a67e764494bf60971eece859dca95fb6470ffd4065af7444"
+    checksum = "d9f193572d3a38b3062ae4cb89afc654e662eb734a9361b1575d649b9530cf60"
+  elsif os == "arch" && !arm
+    filename = "or-tools_amd64_archlinux_cpp_v#{version}.tar.gz"
+    checksum = "803e4b78e7d05b8027a2a391183c8c7855bb758f74d9ced872cfa68e0b9d7d64"
   else
     platform =
       if Gem.win_platform?
         "Windows"
       elsif os || os_version
-        "#{os} #{os_version}"
+        "#{os} #{os_version} #{arch}"
       else
         "Unknown"
       end
@@ -147,6 +147,9 @@ Dir.mktmpdir do |extract_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
 end
 
 # export

data/lib/or-tools.rb

@@ -2,37 +2,37 @@
 require "or_tools/ext"
 
 # modules
-require "or_tools/comparison"
-require "or_tools/comparison_operators"
-require "or_tools/bool_var"
-require "or_tools/constant"
-require "or_tools/cp_model"
-require "or_tools/cp_solver"
-require "or_tools/cp_solver_solution_callback"
-require "or_tools/int_var"
-require "or_tools/knapsack_solver"
-require "or_tools/linear_constraint"
-require "or_tools/linear_expr"
-require "or_tools/mp_variable"
-require "or_tools/product_cst"
-require "or_tools/routing_index_manager"
-require "or_tools/routing_model"
-require "or_tools/sat_linear_expr"
-require "or_tools/sat_int_var"
-require "or_tools/solver"
-require "or_tools/sum_array"
-require "or_tools/version"
+require_relative "or_tools/comparison"
+require_relative "or_tools/comparison_operators"
+require_relative "or_tools/bool_var"
+require_relative "or_tools/constant"
+require_relative "or_tools/cp_model"
+require_relative "or_tools/cp_solver"
+require_relative "or_tools/cp_solver_solution_callback"
+require_relative "or_tools/int_var"
+require_relative "or_tools/knapsack_solver"
+require_relative "or_tools/linear_constraint"
+require_relative "or_tools/linear_expr"
+require_relative "or_tools/mp_variable"
+require_relative "or_tools/product_cst"
+require_relative "or_tools/routing_index_manager"
+require_relative "or_tools/routing_model"
+require_relative "or_tools/sat_linear_expr"
+require_relative "or_tools/sat_int_var"
+require_relative "or_tools/solver"
+require_relative "or_tools/sum_array"
+require_relative "or_tools/version"
 
 # solution printers
-require "or_tools/objective_solution_printer"
-require "or_tools/var_array_solution_printer"
-require "or_tools/var_array_and_objective_solution_printer"
+require_relative "or_tools/objective_solution_printer"
+require_relative "or_tools/var_array_solution_printer"
+require_relative "or_tools/var_array_and_objective_solution_printer"
 
 # higher level interfaces
-require "or_tools/basic_scheduler"
-require "or_tools/seating"
-require "or_tools/sudoku"
-require "or_tools/tsp"
+require_relative "or_tools/basic_scheduler"
+require_relative "or_tools/seating"
+require_relative "or_tools/sudoku"
+require_relative "or_tools/tsp"
 
 module ORTools
   class Error < StandardError; end

data/lib/or_tools/routing_model.rb

@@ -13,5 +13,9 @@ module ORTools
       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

data/lib/or_tools/version.rb

@@ -1,3 +1,3 @@
 module ORTools
-  VERSION = "0.10.1"
+  VERSION = "0.11.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 2023-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '4.1'
 description:
 email: andrew@ankane.org
 executables: []
@@ -85,14 +85,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Operations research tools for Ruby