or-tools 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a94dfe67ccc7166a4ab27cbf5747d332452715db7ad302fa325ef7b5b270ef12
-  data.tar.gz: 36aacbdbf3be07f26e8711bc0ec00d8c1ac929288c62661f7425c721eb827c5d
+  metadata.gz: 03544e925041f7337e6e6ba1b00b6d6c4d97353bcd7ee3785a46959a952bf09c
+  data.tar.gz: eddbab6814900afc7ddda651da92a53aa06b0db857659ab2ccd1c1adb9770fe0
 SHA512:
-  metadata.gz: 9c66c41c7b34b75f09725bbf74c04e7d7a9c2eee5251cc294480baa9a4f8a1a0fcde3534f75f3462d69fdc7c97ec5367dac1cf5fae210351ae731c1cb3c4d5f3
-  data.tar.gz: c8cc4f3c87e7199f9322caa714435699e000be1888f33e2c6b1121aa72dfab1d8b10ba8100fd3ff64b6dcc43853c2b36485922cab2f3b0268ec8cddb1fe15bdc
+  metadata.gz: '041939b99da310567a099f7654658697b93e36436abf06779336ca51e0d02be94473c0474d238041285975f293734cde65c37e5db565b8f30b49f856fe519100'
+  data.tar.gz: '09f6a2f0701acb005f356555df0d0e19befe36090d4de1b2188e7944a55836c80022eed5d4e185dc3b3b016c9c73fa3d5957e8c3cf8adf83bf4773b1090e5f0a'

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.7.0 (2022-03-23)
+
+- Updated OR-Tools to 9.3
+- Removed `add_lin_min_equality` (use `add_min_equality` instead)
+- Removed `add_lin_max_equality` (use `add_max_equality` instead)
+- Dropped support for Debian 10
+
 ## 0.6.3 (2022-03-13)
 
 - Reduced gem size

data/ext/or-tools/constraint.cpp

@@ -57,11 +57,11 @@ namespace Rice::detail
           auto coeff = From_Ruby<int64_t>().convert(cvar[1].value());
 
           if (var.is_a(rb_cBoolVar)) {
-            expr.AddTerm(From_Ruby<BoolVar>().convert(var.value()), coeff);
+            expr += From_Ruby<BoolVar>().convert(var.value()) * coeff;
           } else if (var.is_a(rb_cInteger)) {
-            expr.AddConstant(From_Ruby<int64_t>().convert(var.value()) * coeff);
+            expr += From_Ruby<int64_t>().convert(var.value()) * coeff;
           } else {
-            expr.AddTerm(From_Ruby<IntVar>().convert(var.value()), coeff);
+            expr += From_Ruby<IntVar>().convert(var.value()) * coeff;
           }
         }
       } else {
@@ -253,42 +253,32 @@ void init_constraint(Rice::Module& m) {
       })
     .define_method(
       "add_min_equality",
-      [](CpModelBuilder& self, IntVar target, std::vector<IntVar> vars) {
+      [](CpModelBuilder& self, LinearExpr target, std::vector<LinearExpr> vars) {
         return self.AddMinEquality(target, vars);
       })
-    .define_method(
-      "add_lin_min_equality",
-      [](CpModelBuilder& self, LinearExpr target, std::vector<LinearExpr> exprs) {
-        return self.AddLinMinEquality(target, exprs);
-      })
     .define_method(
       "add_max_equality",
-      [](CpModelBuilder& self, IntVar target, std::vector<IntVar> vars) {
+      [](CpModelBuilder& self, LinearExpr target, std::vector<LinearExpr> vars) {
         return self.AddMaxEquality(target, vars);
       })
-    .define_method(
-      "add_lin_max_equality",
-      [](CpModelBuilder& self, LinearExpr target, std::vector<LinearExpr> exprs) {
-        return self.AddLinMaxEquality(target, exprs);
-      })
     .define_method(
       "add_division_equality",
-      [](CpModelBuilder& self, IntVar target, IntVar numerator, IntVar denominator) {
+      [](CpModelBuilder& self, LinearExpr target, LinearExpr numerator, LinearExpr denominator) {
         return self.AddDivisionEquality(target, numerator, denominator);
       })
     .define_method(
       "add_abs_equality",
-      [](CpModelBuilder& self, IntVar target, IntVar var) {
+      [](CpModelBuilder& self, LinearExpr target, LinearExpr var) {
         return self.AddAbsEquality(target, var);
       })
     .define_method(
       "add_modulo_equality",
-      [](CpModelBuilder& self, IntVar target, IntVar var, IntVar mod) {
+      [](CpModelBuilder& self, LinearExpr target, LinearExpr var, LinearExpr mod) {
         return self.AddModuloEquality(target, var, mod);
       })
     .define_method(
       "add_multiplication_equality",
-      [](CpModelBuilder& self, IntVar target, std::vector<IntVar> vars) {
+      [](CpModelBuilder& self, LinearExpr target, std::vector<LinearExpr> vars) {
         return self.AddMultiplicationEquality(target, vars);
       })
     .define_method(

data/ext/or-tools/vendor.rb

@@ -4,7 +4,7 @@ require "fileutils"
 require "net/http"
 require "tmpdir"
 
-version = "9.2.9972"
+version = "9.3.10497"
 
 if RbConfig::CONFIG["host_os"] =~ /darwin/i
   if RbConfig::CONFIG["host_cpu"] =~ /arm|aarch64/i
@@ -17,8 +17,8 @@ if RbConfig::CONFIG["host_os"] =~ /darwin/i
 
     MSG
   else
-    filename = "or-tools_MacOsX-12.0.1_v#{version}.tar.gz"
-    checksum = "796791a8ef84507d62e193e647cccb1c7725dae4f1474476e1777fe4a44ee3e0"
+    filename = "or-tools_MacOsX-12.2.1_v#{version}.tar.gz"
+    checksum = "33941702c59983897935eef06d91aca6c89ed9a8f5f4de3a9dfe489e97d7ca8c"
   end
 else
   # try /etc/os-release with fallback to /usr/lib/os-release
@@ -32,23 +32,21 @@ else
   os_version = os_info["VERSION_ID"]
 
   if os == "ubuntu" && os_version == "20.04"
-    filename = "or-tools_amd64_ubuntu-20.04_v#{version}.tar.gz"
-    checksum = "985e3036eaecacfc8a0258ec2ebef429240491577d4e0896d68fc076e65451ec"
+    # TODO remove sub in v9.4
+    filename = "or-tools_amd64_ubuntu-20.04_v#{version.sub(".10497", ".10502")}.tar.gz"
+    checksum = "3d1979967a2c9358b5bc956f2e6b608b00e89e13c71d48d075475ce4138b6d1c"
   elsif os == "ubuntu" && os_version == "18.04"
     filename = "or-tools_amd64_ubuntu-18.04_v#{version}.tar.gz"
-    checksum = "e36406c4fe8c111e1ace0ede9d0787ff0e98f11afd7db9cc074adfd0f55628a6"
+    checksum = "6ba5cc153417267e8f8e15f8b6390b17f22de07bacc61f3740a4172ccd56c274"
   elsif os == "debian" && os_version == "11"
     filename = "or-tools_amd64_debian-11_v#{version}.tar.gz"
-    checksum = "bd49ee916213b2140ab255414d35a28f19dff7caf87632309753d3fc553f85dd"
-  elsif os == "debian" && os_version == "10"
-    filename = "or-tools_amd64_debian-10_v#{version}.tar.gz"
-    checksum = "b152fee584f0c8228fe2ff21b74c789870ff9b7064e42ca26305c6b5653f0064"
+    checksum = "db0636bab909eabf06a7004f7572dca6fa152f3823c1365b0b7428405bf250e6"
   elsif os == "centos" && os_version == "8"
     filename = "or-tools_amd64_centos-8_v#{version}.tar.gz"
-    checksum = "66ed4bb800acf92c672f7e68acdf4ea27bbfdb17bbddc02f8326cd55a97305f6"
+    checksum = "e5649069fd7a3e8228cc18b91e265a90562c5d03a0c962b0346911aada0aedc9"
   elsif os == "centos" && os_version == "7"
     filename = "or-tools_amd64_centos-7_v#{version}.tar.gz"
-    checksum = "4a5c1b1639a2828cd7e1ba82a574ef37876557b59e8aab8b81811bb750d53035"
+    checksum = "3bffdec8c09fc1345dcbd6a553437e2894014093fafb53e50adc7d4d776bb08b"
   else
     platform =
       if Gem.win_platform?
@@ -144,9 +142,13 @@ Dir.mktmpdir do |extract_path|
 
   # shared library
   FileUtils.mkdir(File.join(path, "lib"))
-  Dir.glob("lib/libortools.{dylib,so}", base: extract_path) do |file|
+  Dir.glob("lib/libortools.{dylib,so.9}", base: extract_path) do |file|
     FileUtils.cp(File.join(extract_path, file), File.join(path, file))
   end
+  so_path = File.join(path, "lib/libortools.so.9")
+  if File.exist?(so_path)
+    File.symlink(so_path, File.join(path, "lib/libortools.so"))
+  end
 end
 
 # export

data/lib/or_tools/version.rb

@@ -1,3 +1,3 @@
 module ORTools
-  VERSION = "0.6.3"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-13 00:00:00.000000000 Z
+date: 2022-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice