or-tools 0.11.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db5ea336dfbb4e2a150736473ff1e51cbd125976ea287a130b95316d81b438b2
-  data.tar.gz: 2998d8aefe52396ebabe019d5093343980c785c2735ae3f1396d884000f9cc1c
+  metadata.gz: 55a9b05e208ea0dd70243881bf35ce603f2d68b4899bf0595b035329c484b7b7
+  data.tar.gz: 201d0173f91ccc86ebb351e2ee87b72184d5fd08ce755875f930742b1a2b8632
 SHA512:
-  metadata.gz: 25a64519e5ca3ec8e2746369e54f234961022da4bad42283e76ad323b9e39218683d0e1831a7e79bb46237966674f1729b46e50c894f435dceee438bdd1e6aee
-  data.tar.gz: 47c5ae441d52e4e84bb2f1efcb97b1f9b0786870fb6f6ddb87b6e115a1ab337453c1550b3bed3d4a3558393f250b37367653104a31ea1fbb57fe6f290ac37f86
+  metadata.gz: 19a28702b80c76dbc2d9cb868a2d5b627c92036253ea5076ea5d070578064f3b0b4065c84e7ea4edd1c324d58b10655960b15c0f4a104d00adaa89e70aecaa19
+  data.tar.gz: f40224649c5d1335d616f4bc0937c0a26a22d84b397d11ee6e2dd6637606d37ea10070b4c267a7497781db80bfdd3b663d24a6660fc911d19dd86fb602ceb152

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.13.0 (2024-09-17)
+
+- Updated OR-Tools to 9.11
+- Restored binary installation for Ubuntu 20.04
+- Dropped binary installation for CentOS 7
+- Removed dependency on `csv` gem
+
+## 0.12.0 (2024-06-02)
+
+- Updated OR-Tools to 9.10
+- Added `export_to_file` method to `CpModel`
+- Added `random_seed` and `random_seed=` methods to `SatParameters`
+- Added binary installation for Ubuntu 24.04
+- Dropped binary installation for Ubuntu 20.04 and Debian 11 ARM
+- Dropped support for Ruby < 3.1
+
 ## 0.11.1 (2023-12-04)
 
 - Added binary installation for Arch Linux

data/README.md

@@ -2,7 +2,7 @@
 
 [OR-Tools](https://github.com/google/or-tools) - operations research tools - for Ruby
 
-[![Build Status](https://github.com/ankane/or-tools-ruby/workflows/build/badge.svg?branch=master)](https://github.com/ankane/or-tools-ruby/actions)
+[![Build Status](https://github.com/ankane/or-tools-ruby/actions/workflows/build.yml/badge.svg)](https://github.com/ankane/or-tools-ruby/actions)
 
 ## Installation
 

data/ext/or-tools/constraint.cpp

@@ -160,6 +160,14 @@ void init_constraint(Rice::Module& m) {
     .define_method("cp_model_presolve=",
       [](SatParameters& self, bool value) {
         self.set_cp_model_presolve(value);
+      })
+    .define_method("random_seed",
+      [](SatParameters& self) {
+        return self.random_seed();
+      })
+    .define_method("random_seed=",
+      [](SatParameters& self, int32_t value) {
+        self.set_random_seed(value);
       });
 
   Rice::define_class_under<CpModelBuilder>(m, "CpModel")
@@ -350,6 +358,11 @@ void init_constraint(Rice::Module& m) {
       [](CpModelBuilder& self) {
         self.ClearAssumptions();
       })
+    .define_method(
+      "export_to_file",
+      [](CpModelBuilder& self, const std::string& filename) {
+        return self.ExportToFile(filename);
+      })
     .define_method(
       "to_s",
       [](CpModelBuilder& self) {
@@ -432,12 +445,12 @@ void init_constraint(Rice::Module& m) {
       })
     .define_method(
       "_solution_integer_value",
-      [](Object self, CpSolverResponse& response, IntVar& x) {
+      [](Object self, const CpSolverResponse& response, IntVar x) {
         return SolutionIntegerValue(response, x);
       })
     .define_method(
       "_solution_boolean_value",
-      [](Object self, CpSolverResponse& response, BoolVar& x) {
+      [](Object self, const CpSolverResponse& response, BoolVar x) {
         return SolutionBooleanValue(response, x);
       });
 }

data/ext/or-tools/extconf.rb

@@ -19,7 +19,7 @@ else
 
   # make rpath relative
   # use double dollar sign and single quotes to escape properly
-  rpath_prefix = RbConfig::CONFIG["host_os"] =~ /darwin/ ? "@loader_path" : "$$ORIGIN"
+  rpath_prefix = RbConfig::CONFIG["host_os"].match?(/darwin/) ? "@loader_path" : "$$ORIGIN"
   rpath = "'#{rpath_prefix}/../../tmp/or-tools/lib'"
 end
 

data/ext/or-tools/routing.cpp

@@ -296,6 +296,8 @@ void init_routing(Rice::Module& m) {
       return operations_research::DefaultRoutingModelParameters();
     });
 
+  Rice::define_class_under<RoutingModel::ResourceGroup>(m, "ResourceGroup");
+
   Rice::define_class_under<RoutingModel>(m, "RoutingModel")
     .define_constructor(Rice::Constructor<RoutingModel, RoutingIndexManager, RoutingModelParameters>(), Rice::Arg("index_manager"), Rice::Arg("parameters") = operations_research::DefaultRoutingModelParameters())
     .define_method("register_unary_transit_vector", &RoutingModel::RegisterUnaryTransitVector)
@@ -307,7 +309,7 @@ void init_routing(Rice::Module& m) {
             return Rice::detail::From_Ruby<int64_t>().convert(callback.call("call", from_index));
           }
         );
-      })
+      }, Rice::Arg("callback").keepAlive())
     .define_method("register_transit_matrix", &RoutingModel::RegisterTransitMatrix)
     .define_method(
       "register_transit_callback",
@@ -317,7 +319,7 @@ void init_routing(Rice::Module& m) {
             return Rice::detail::From_Ruby<int64_t>().convert(callback.call("call", from_index, to_index));
           }
         );
-      })
+      }, Rice::Arg("callback").keepAlive())
     .define_method("add_dimension", &RoutingModel::AddDimension)
     .define_method("add_dimension_with_vehicle_transits", &RoutingModel::AddDimensionWithVehicleTransits)
     .define_method("add_dimension_with_vehicle_capacity", &RoutingModel::AddDimensionWithVehicleCapacity)

data/ext/or-tools/vendor.rb

@@ -1,21 +1,20 @@
-require "csv"
 require "digest"
 require "fileutils"
 require "net/http"
 require "tmpdir"
 
-version = "9.8.3296"
+version = "9.11.4210"
 
 arch = RbConfig::CONFIG["host_cpu"]
-arm = arch =~ /arm|aarch64/i
+arm = arch.match?(/arm|aarch64/i)
 
-if RbConfig::CONFIG["host_os"] =~ /darwin/i
+if RbConfig::CONFIG["host_os"].match?(/darwin/i)
   if arm
-    filename = "or-tools_arm64_macOS-14.1_cpp_v#{version}.tar.gz"
-    checksum = "253efad127c55b78967e3e3a3b4a573f9da0a2562c4f33f14fbf462ca58448f7"
+    filename = "or-tools_arm64_macOS-14.6.1_cpp_v#{version}.tar.gz"
+    checksum = "a106668eb1975c1672874ef24b4f8e2e56669467a63349e5ea8ef5419814c31b"
   else
-    filename = "or-tools_x86_64_macOS-14.1_cpp_v#{version}.tar.gz"
-    checksum = "fe48b022799c807baba79a2b13c29bf9d9614827ba082fc688559d0cab879a86"
+    filename = "or-tools_x86_64_macOS-14.6.1_cpp_v#{version}.tar.gz"
+    checksum = "cc87a7f8c68ec4fed6c6de6565b0b625f2f0047185a8a4449ef4b5a305b60e55"
   end
 else
   # try /etc/os-release with fallback to /usr/lib/os-release
@@ -23,29 +22,26 @@ else
   os_filename = File.exist?("/etc/os-release") ? "/etc/os-release" : "/usr/lib/os-release"
 
   # for safety, parse rather than source
-  os_info = CSV.read(os_filename, col_sep: "=").to_h rescue {}
+  os_info = File.readlines(os_filename, chomp: true).to_h { |v| v.split("=", 2) }.transform_values { |v| v.delete_prefix('"').delete_suffix('"') } rescue {}
 
   os = os_info["ID"]
   os_version = os_info["VERSION_ID"]
 
-  if os == "ubuntu" && os_version == "22.04" && !arm
+  if os == "ubuntu" && os_version == "24.04" && !arm
+    filename = "or-tools_amd64_ubuntu-24.04_cpp_v#{version}.tar.gz"
+    checksum = "71761d93171b111fca736647a6cd00cb9e606474df597a8b48f3f5f2c73d4c0f"
+  elsif os == "ubuntu" && os_version == "22.04" && !arm
     filename = "or-tools_amd64_ubuntu-22.04_cpp_v#{version}.tar.gz"
-    checksum = "2a332e95897ac6fc2cfd0122bcbc07cfd286d0f579111529cc99ac3076f5421a"
+    checksum = "f613574d4eae01afd966c8bde199990cbd9fad46035e675d71f17f5c7477eed4"
   elsif os == "ubuntu" && os_version == "20.04" && !arm
     filename = "or-tools_amd64_ubuntu-20.04_cpp_v#{version}.tar.gz"
-    checksum = "95789f8d93dfb298efecd1c0b888f9a148c011e1a20505b00c38452d68b01644"
+    checksum = "190b85f4510cab55fcb50b9850a0e2f94b2bdf5e266580650efbc5aaab760683"
   elsif os == "debian" && os_version == "11" && !arm
     filename = "or-tools_amd64_debian-11_cpp_v#{version}.tar.gz"
-    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 = "d9f193572d3a38b3062ae4cb89afc654e662eb734a9361b1575d649b9530cf60"
+    checksum = "a8354696f365aa13a2375da5f8f6cfd8785430681addcd887bfd194851dd4710"
   elsif os == "arch" && !arm
     filename = "or-tools_amd64_archlinux_cpp_v#{version}.tar.gz"
-    checksum = "803e4b78e7d05b8027a2a391183c8c7855bb758f74d9ced872cfa68e0b9d7d64"
+    checksum = "ac892a949d871294b7e26b0730440ab8629b4021bf3c1641bc7c8fb09b45081f"
   else
     platform =
       if Gem.win_platform?

data/lib/or_tools/sudoku.rb

@@ -4,7 +4,7 @@ module ORTools
 
     def initialize(initial_grid, x: false, magic_square: false, anti_knight: false, anti_king: false, non_consecutive: false)
       raise ArgumentError, "Grid must be 9x9" unless initial_grid.size == 9 && initial_grid.all? { |r| r.size == 9 }
-      raise ArgumentError, "Grid must contain values between 0 and 9" unless initial_grid.flatten(1).all? { |v| (0..9).include?(v) }
+      raise ArgumentError, "Grid must contain values between 0 and 9" unless initial_grid.flatten(1).all? { |v| (0..9).cover?(v) }
 
       model = ORTools::CpModel.new
 

data/lib/or_tools/sum_array.rb

@@ -7,7 +7,7 @@ module ORTools
     end
 
     def add_self_to_coeff_map_or_stack(coeffs, multiplier, stack)
-      @array.reverse.each do |arg|
+      @array.reverse_each do |arg|
         stack << [multiplier, arg]
       end
     end

data/lib/or_tools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-04 00:00:00.000000000 Z
+date: 2024-09-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.1'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.3'
 description:
 email: andrew@ankane.org
 executables: []
@@ -85,14 +85,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Operations research tools for Ruby