or-tools 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a065257839dbcfaf581658f48c0aa1beeac58be2501dd5f8af71e071b3dba3b7
-  data.tar.gz: '0088e7e979a58ab54f8f1997fb9e60e0533d7c9e9412e40dd46840082123a7ef'
+  metadata.gz: 68ea17bb23e576a57ac2f4949cf79d0248445dc90fbf8148a538d02c3b853bb7
+  data.tar.gz: 4d066a51a1dea924f8d8edad1f70313002073233e92c86f07418f7ad19a1f29e
 SHA512:
-  metadata.gz: cc1104b210214512d2467ad26ddcaf28b40a761ba675e7236908c067fa12e5b25858c61dc5972130fcab47460c0c8a080d963fd9e7af75847d1525bdb80b728b
-  data.tar.gz: f5365be019631c1684fbb274d5fff703de405771fd286ccb8047660fb88060a8bb77ace47a906e19ae12690488755c14222116f0c2210dc92bd7c2931567ed0f
+  metadata.gz: 06fd522bf2d86fff7117637d07e62168a1cc4b10bf371d11fd5d8973027e43079c93723abe666e071ac77dd683a73cb584f0987d1ec78d842f1a0e66a75ce2f9
+  data.tar.gz: 558b06c83bc6e8108d6175325a7d6408b047f127c16a5f12a197d83509eeca2a9dc9ed01ea72383ed6176aae8fc4d18a378003d8ca274cff42a117a5d164a989

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 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`
+- Added `add_linear_constraint` and `add_linear_expression_in_domain` methods to `CpModel`
+
 ## 0.10.0 (2023-03-15)
 
 - Updated OR-Tools to 9.6

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

@@ -3,6 +3,7 @@
 
 #include "ext.h"
 
+using operations_research::Domain;
 using operations_research::sat::BoolVar;
 using operations_research::sat::Constraint;
 using operations_research::sat::CpModelBuilder;
@@ -98,8 +99,14 @@ namespace Rice::detail
 }
 
 void init_constraint(Rice::Module& m) {
+  Rice::define_class_under<Domain>(m, "Domain")
+    .define_constructor(Rice::Constructor<Domain, int64_t, int64_t>())
+    .define_method("min", &Domain::Min)
+    .define_method("max", &Domain::Max);
+
   rb_cSatIntVar = Rice::define_class_under<IntVar>(m, "SatIntVar")
-    .define_method("name", &IntVar::Name);
+    .define_method("name", &IntVar::Name)
+    .define_method("domain", &IntVar::Domain);
 
   Rice::define_class_under<IntervalVar>(m, "SatIntervalVar")
     .define_method("name", &IntervalVar::Name);
@@ -145,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")
@@ -230,12 +245,16 @@ void init_constraint(Rice::Module& m) {
       [](CpModelBuilder& self, LinearExpr x, LinearExpr y) {
         return self.AddLessThan(x, y);
       })
-    // TODO add domain
-    // .define_method(
-    //   "add_linear_constraint",
-    //   [](CpModelBuilder& self, LinearExpr expr, Domain domain) {
-    //     return self.AddLinearConstraint(expr, domain);
-    //   })
+    .define_method(
+      "add_linear_constraint",
+      [](CpModelBuilder& self, LinearExpr expr, int64_t lb, int64_t ub) {
+        return self.AddLinearConstraint(expr, Domain(lb, ub));
+      })
+    .define_method(
+      "add_linear_expression_in_domain",
+      [](CpModelBuilder& self, LinearExpr expr, Domain domain) {
+        return self.AddLinearConstraint(expr, domain);
+      })
     .define_method(
       "add_not_equal",
       [](CpModelBuilder& self, LinearExpr x, LinearExpr y) {
@@ -397,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,15 @@ require "fileutils"
 require "net/http"
 require "tmpdir"
 
-version = "9.6.2534"
+version = "9.8.3296"
 
 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"
+    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
@@ -27,25 +27,16 @@ else
 
   if os == "ubuntu" && os_version == "22.04"
     filename = "or-tools_amd64_ubuntu-22.04_cpp_v#{version}.tar.gz"
-    checksum = "e7960113b156b13e23a179ca09646845e762f452aa525bf9b12a40e5ae3c6ca4"
+    checksum = "2a332e95897ac6fc2cfd0122bcbc07cfd286d0f579111529cc99ac3076f5421a"
   elsif os == "ubuntu" && os_version == "20.04"
     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"
+    checksum = "95789f8d93dfb298efecd1c0b888f9a148c011e1a20505b00c38452d68b01644"
   elsif os == "debian" && os_version == "11"
     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"
+    checksum = "e7dd81b13c53c739447254b8836ece55f8b92a107688cc9f3511705c9962fa2d"
   elsif os == "centos" && os_version == "7"
     filename = "or-tools_amd64_centos-7_cpp_v#{version}.tar.gz"
-    checksum = "96012ac1280a98d6a67e764494bf60971eece859dca95fb6470ffd4065af7444"
+    checksum = "d9f193572d3a38b3062ae4cb89afc654e662eb734a9361b1575d649b9530cf60"
   else
     platform =
       if Gem.win_platform?
@@ -147,6 +138,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.0"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-11-17 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