or-tools 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c16581924f813458dc535d2a8804bf02a7f0a605fac108d14894f13ed7af984a
-  data.tar.gz: 28bd124da203c4dd0ac50ee86aca3deb7ba283a1cbd711521985972a02bdcaa1
+  metadata.gz: e88bfc983ea525a514082c15ad21c53f9e35f8b1d291d55f6810a0c47c7a2fa8
+  data.tar.gz: d3101dceed98ebd35f788c1cd5df122078cd435f5bceb21cf4e7a1b13dd2ac04
 SHA512:
-  metadata.gz: 0612e5bfcf96ba9ec2591dab7bbfe175625f874ff89e87a168d771a0f81948cb4d8d29e31de0487470eb3b993ef53b793ac25a0b078c5cc54385d4cd3bb159f9
-  data.tar.gz: dd548021defe7c1249ecee70790cb29f4c85a5ec04cace94cc9bfa0192b24d68e20040a7dd355b148f75f443bf882cc41ec3ea6613785a24aeb4a37674ca8017
+  metadata.gz: a12e68f45b7829f76d77e107c14cb072158bc956348b07dc93bc0bcb4a91f6fff8a22389d88bd8102a3c7d6eec86e25e4aeca4043cd4b2b560575f8d5dde8578
+  data.tar.gz: 1448aa409c1664ce15e859a5ad115b4ba975f4b976ad522cc95db4699c65c9356a5b78f05507db166a46fd60cc80e0907a85b625fc2150bdaa591fe3aa7b13db

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.5.4 (2021-10-01)
+
+- Updated OR-Tools to 9.1
+- Added binary installation for Debian 11
+- Deprecated `solve_with_solution_callback` and `search_for_all_solutions`
+
 ## 0.5.3 (2021-08-02)
 
 - Added more methods to `IntVar`, `IntervalVar`, and `Constraint`

data/README.md

@@ -2139,7 +2139,7 @@ model.add(seats[[0, 0]] == 1)
 # Solve model
 solver = ORTools::CpSolver.new
 solution_printer = WeddingChartPrinter.new(seats, names, num_tables, num_guests)
-solver.solve_with_solution_callback(model, solution_printer)
+solver.solve(model, solution_printer)
 
 puts "Statistics"
 puts "  - conflicts    : %i" % solver.num_conflicts

data/ext/or-tools/constraint.cpp

@@ -131,10 +131,21 @@ void init_constraint(Rice::Module& m) {
 
   Rice::define_class_under<SatParameters>(m, "SatParameters")
     .define_constructor(Rice::Constructor<SatParameters>())
-    .define_method("max_time_in_seconds=",
-    [](SatParameters& self, double value) {
-      self.set_max_time_in_seconds(value);
-    });
+    .define_method(
+      "max_time_in_seconds=",
+      [](SatParameters& self, double value) {
+        self.set_max_time_in_seconds(value);
+      })
+    .define_method(
+      "enumerate_all_solutions=",
+      [](SatParameters& self, bool value) {
+        self.set_enumerate_all_solutions(value);
+      })
+    .define_method(
+      "enumerate_all_solutions",
+      [](SatParameters& self) {
+        return self.enumerate_all_solutions();
+      });
 
   Rice::define_class_under<CpModelBuilder>(m, "CpModel")
     .define_constructor(Rice::Constructor<CpModelBuilder>())
@@ -377,29 +388,23 @@ void init_constraint(Rice::Module& m) {
 
   Rice::define_class_under(m, "CpSolver")
     .define_method(
-      "_solve_with_observer",
-      [](Object self, CpModelBuilder& model, SatParameters& parameters, Object callback, bool all_solutions) {
+      "_solve",
+      [](Object self, CpModelBuilder& model, SatParameters& parameters, Object callback) {
         Model m;
 
-        if (all_solutions) {
-          // set parameters for SearchForAllSolutions
-          parameters.set_enumerate_all_solutions(true);
+        if (!callback.is_nil()) {
+          // TODO figure out how to use callback with multiple cores
+          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");
+            })
+          );
         }
-        m.Add(NewSatParameters(parameters));
 
-        m.Add(NewFeasibleSolutionObserver(
-          [callback](const CpSolverResponse& r) {
-            // TODO find a better way to do this
-            callback.call("response=", r);
-            callback.call("on_solution_callback");
-          })
-        );
-        return SolveCpModel(model.Build(), &m);
-      })
-    .define_method(
-      "_solve",
-      [](Object self, CpModelBuilder& model, SatParameters& parameters) {
-        Model m;
         m.Add(NewSatParameters(parameters));
         return SolveCpModel(model.Build(), &m);
       })

data/ext/or-tools/vendor.rb

@@ -3,29 +3,32 @@ require "fileutils"
 require "net/http"
 require "tmpdir"
 
-version = "9.0.9048"
+version = "9.1.9490"
 
 if RbConfig::CONFIG["host_os"] =~ /darwin/i
-  filename = "or-tools_MacOsX-11.2.3_v#{version}.tar.gz"
-  checksum = "adf73a00d4ec49558b67be5ce3cfc8f30268da2253b35feb11d0d40700550bf6"
+  filename = "or-tools_MacOsX-11.6_v#{version}.tar.gz"
+  checksum = "97a2b113806c1b2d17f9b3f30571c9ee82722eb22e06bd124d94118f3a84da2c"
 else
   os = %x[lsb_release -is].chomp rescue nil
   os_version = %x[lsb_release -rs].chomp rescue nil
   if os == "Ubuntu" && os_version == "20.04"
-    filename = "or-tools_ubuntu-20.04_v#{version}.tar.gz"
-    checksum = "5565343c1c310d2885a40ce850ae7e3468299b3fee97ae8eed8425ce06bd4960"
+    filename = "or-tools_amd64_ubuntu-20.04_v#{version}.tar.gz"
+    checksum = "cf82e5c343ab74bef320b240a2c3937b07df945e60b91bbc771b477c0856c1bd"
   elsif os == "Ubuntu" && os_version == "18.04"
-    filename = "or-tools_ubuntu-18.04_v#{version}.tar.gz"
-    checksum = "08cf548d0179f7fa814bb7458be94cd1b8a3de14985e6a9faf6118a1d8571539"
+    filename = "or-tools_amd64_ubuntu-18.04_v#{version}.tar.gz"
+    checksum = "b641677cc3e1095b7e8efd9c5c948698f5e2c238d10d06f1abf0b0ee240addf2"
+  elsif os == "Debian" && os_version == "11"
+    filename = "or-tools_amd64_debian-11_v#{version}.tar.gz"
+    checksum = "de7e63988fc62c64718d8f8f37f98a1c589c89ebc46fc1f378da4b66ad385ff1"
   elsif os == "Debian" && os_version == "10"
-    filename = "or-tools_debian-10_v#{version}.tar.gz"
-    checksum = "063fb1d8765ae23b0bb25b9c561e904532713416fe0458f7db45a0f72190eb50"
+    filename = "or-tools_amd64_debian-10_v#{version}.tar.gz"
+    checksum = "80411caeccac079fe8ee6018ceae844f5f04d2deecacd3406d51354dea5435e4"
   elsif os == "CentOS" && os_version == "8"
-    filename = "or-tools_centos-8_v#{version}.tar.gz"
-    checksum = "c98212ed4fc699d8ae70c1f53cd1d8dacd28e52970336fab5b86dedf7406f215"
+    filename = "or-tools_amd64_centos-8_v#{version}.tar.gz"
+    checksum = "fe23b04dd7a20c5902fbf89bb626080296489a05e0bfb39225e71be5e9cee1ac"
   elsif os == "CentOS" && os_version == "7"
-    filename = "or-tools_centos-7_v#{version}.tar.gz"
-    checksum = "b992bda4614bbc703583b0e9edcd2ade54bacfb9909399b20c8aa95ff7197d68"
+    filename = "or-tools_amd64_centos-7_v#{version}.tar.gz"
+    checksum = "ef48363b27591c25f8702e085024aa7b5f5190ad94c859481116538f04c124f9"
   else
     platform =
       if Gem.win_platform?

data/lib/or_tools/cp_solver.rb

@@ -6,8 +6,8 @@ module ORTools
 
     def_delegators :@response, :objective_value, :num_conflicts, :num_branches, :wall_time
 
-    def solve(model)
-      @response = _solve(model, parameters)
+    def solve(model, observer = nil)
+      @response = _solve(model, parameters, observer)
       @response.status
     end
 
@@ -20,13 +20,19 @@ module ORTools
     end
 
     def solve_with_solution_callback(model, observer)
-      @response = _solve_with_observer(model, parameters, observer, false)
-      @response.status
+      warn "[or-tools] solve_with_solution_callback is deprecated; use solve(model, callback)"
+      solve(model, observer)
     end
 
     def search_for_all_solutions(model, observer)
-      @response = _solve_with_observer(model, parameters, observer, true)
-      @response.status
+      warn "[or-tools] search_for_all_solutions is deprecated; use solve() with solver.parameters.enumerate_all_solutions = true"
+      previous_value = parameters.enumerate_all_solutions
+      begin
+        parameters.enumerate_all_solutions = true
+        solve(model, observer)
+      ensure
+        parameters.enumerate_all_solutions = previous_value
+      end
     end
 
     def sufficient_assumptions_for_infeasibility

data/lib/or_tools/version.rb

@@ -1,3 +1,3 @@
 module ORTools
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice