or-tools 0.15.1 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf6aeeb8a03deeb23478d655a7844b3e49115252fd8ad5cc7285074370580952
-  data.tar.gz: 67db36ddc806b7a2695ea89c9bb2dc3969161df739059e186aed6d67506c4348
+  metadata.gz: dee4a87960e33b5a357e9549cac01fadbbed11aa0e7b8fda11355383f01f853c
+  data.tar.gz: 5cb68b2fb6beb48cf73f5d78fc14930a274da58bf8c743d5199588b4283bd3c7
 SHA512:
-  metadata.gz: 65d8e93c059aa9df5501d8db5252279ede1b85601785663ff0ff41a9e1b5555976c5b9a4304ebfe557d9e9e7802ba30635644b8b857c219e4c925db4d18d8e24
-  data.tar.gz: 3a76c22bc257260861751d79a79cb94f880c4d8f5c82ab7b00d249da586ef05283c031f8517ca77621848b0e0fdc6993e1c81ac9f116d2cae50073dd25177109
+  metadata.gz: ab8788f734a9b525c9d7f385fc32947430c9727aec659a5f898436159a8e90684031508fb5f6bf099381821ff184344f101a52c90e23f716a2bf46f91e7e78e1
+  data.tar.gz: 5b90c3c913f171e464da6c162659a7e4fc896fa30f6996e21d145b07f93d4a925d71af71d1ddee2eab27f1850545715abd2016bb52f6b6151badc06eb8a6f37a

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.16.1 (2025-10-26)
+
+- Added `add_allowed_assignments` and `add_forbidden_assignments` methods to `CpModel`
+- Fixed error with Rice 4.7
+
+## 0.16.0 (2025-06-19)
+
+- Updated OR-Tools to 9.14
+
 ## 0.15.1 (2025-06-18)
 
 - Fixed error with Rice 4.6

data/ext/or-tools/bin_packing.cpp

@@ -20,6 +20,10 @@ namespace Rice::detail {
   template<>
   class From_Ruby<KnapsackSolver::SolverType> {
   public:
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
     Convertible is_convertible(VALUE value) { return Convertible::Cast; }
 
     KnapsackSolver::SolverType convert(VALUE x) {
@@ -30,6 +34,9 @@ namespace Rice::detail {
         throw std::runtime_error("Unknown solver type: " + s);
       }
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
 } // namespace Rice::detail
 

data/ext/or-tools/constraint.cpp

@@ -9,6 +9,7 @@
 using operations_research::Domain;
 using operations_research::sat::BoolVar;
 using operations_research::sat::Constraint;
+using operations_research::sat::TableConstraint;
 using operations_research::sat::CpModelBuilder;
 using operations_research::sat::CpSolverResponse;
 using operations_research::sat::CpSolverStatus;
@@ -39,6 +40,10 @@ namespace Rice::detail {
   template<>
   class From_Ruby<LinearExpr> {
   public:
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
     Convertible is_convertible(VALUE value) { return Convertible::Cast; }
 
     LinearExpr convert(VALUE v) {
@@ -62,6 +67,9 @@ namespace Rice::detail {
 
       return expr;
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
 } // namespace Rice::detail
 
@@ -103,6 +111,13 @@ void init_constraint(Rice::Module& m) {
         }
       });
 
+  Rice::define_class_under<TableConstraint, Constraint>(m, "SatTableConstraint")
+    .define_method(
+      "add_tuple",
+      [](TableConstraint& self, std::vector<int64_t> tuple) {
+        self.AddTuple(tuple);
+      });
+
   rb_cBoolVar = Rice::define_class_under<BoolVar>(m, "SatBoolVar")
     .define_method("name", &BoolVar::Name)
     .define_method("index", &BoolVar::index)
@@ -251,6 +266,16 @@ void init_constraint(Rice::Module& m) {
       [](CpModelBuilder& self, std::vector<IntVar> vars) {
         return self.AddAllDifferent(vars);
       })
+    .define_method(
+      "add_allowed_assignments",
+      [](CpModelBuilder& self, std::vector<LinearExpr> expressions) {
+        return self.AddAllowedAssignments(expressions);
+      })
+    .define_method(
+      "add_forbidden_assignments",
+      [](CpModelBuilder& self, std::vector<LinearExpr> expressions) {
+        return self.AddForbiddenAssignments(expressions);
+      })
     .define_method(
       "add_inverse_constraint",
       [](CpModelBuilder& self, std::vector<IntVar> variables, std::vector<IntVar> inverse_variables) {
@@ -391,7 +416,7 @@ void init_constraint(Rice::Module& m) {
         auto a = Array();
         auto assumptions = self.sufficient_assumptions_for_infeasibility();
         for (const auto& v : assumptions) {
-          a.push(v);
+          a.push(v, false);
         }
         return a;
       });

data/ext/or-tools/extconf.rb

@@ -6,7 +6,7 @@ $CXXFLAGS << " -std=c++17 $(optflags) -DUSE_CBC -DOR_PROTO_DLL="
 $CXXFLAGS << " -Wall -Wextra"
 
 # hide or-tools warnings
-$CXXFLAGS << " -Wno-sign-compare -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-missing-field-initializers"
+$CXXFLAGS << " -Wno-sign-compare -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-missing-field-initializers -Wno-deprecated-declarations"
 
 # hide Rice warnings
 $CXXFLAGS << " -Wno-unused-private-field -Wno-implicit-fallthrough"

data/ext/or-tools/linear.cpp

@@ -26,6 +26,10 @@ namespace Rice::detail {
 
   template<>
   struct From_Ruby<MPSolver::OptimizationProblemType> {
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
     Convertible is_convertible(VALUE value) { return Convertible::Cast; }
 
     static MPSolver::OptimizationProblemType convert(VALUE x) {
@@ -38,6 +42,9 @@ namespace Rice::detail {
         throw std::runtime_error("Unknown optimization problem type: " + s);
       }
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
 } // namespace Rice::detail
 

data/ext/or-tools/math_opt.cpp

@@ -25,6 +25,10 @@ namespace Rice::detail {
 
   template<>
   struct From_Ruby<SolverType> {
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
     Convertible is_convertible(VALUE value) { return Convertible::Cast; }
 
     static SolverType convert(VALUE x) {
@@ -53,6 +57,9 @@ namespace Rice::detail {
         throw std::runtime_error("Unknown solver type: " + s);
       }
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
 } // namespace Rice::detail
 
@@ -61,7 +68,11 @@ void init_math_opt(Rice::Module& m) {
 
   Rice::define_class_under<Variable>(mathopt, "Variable")
     .define_method("id", &Variable::id)
-    .define_method("name", &Variable::name)
+    .define_method(
+      "name",
+      [](Variable& self) {
+        return std::string(self.name());
+      })
     .define_method(
       "_eql?",
       [](Variable& self, Variable &other) {

data/ext/or-tools/network_flows.cpp

@@ -5,7 +5,6 @@
 #include <rice/rice.hpp>
 #include <rice/stl.hpp>
 
-using operations_research::NodeIndex;
 using operations_research::SimpleMaxFlow;
 using operations_research::SimpleMinCostFlow;
 
@@ -25,7 +24,7 @@ void init_network_flows(Rice::Module& m) {
     .define_method("flow", &SimpleMaxFlow::Flow)
     .define_method(
       "solve",
-      [](SimpleMaxFlow& self, NodeIndex source, NodeIndex sink) {
+      [](SimpleMaxFlow& self, SimpleMaxFlow::NodeIndex source, SimpleMaxFlow::NodeIndex sink) {
         auto status = self.Solve(source, sink);
 
         if (status == SimpleMaxFlow::Status::OPTIMAL) {
@@ -43,24 +42,24 @@ void init_network_flows(Rice::Module& m) {
     .define_method(
       "source_side_min_cut",
       [](SimpleMaxFlow& self) {
-        std::vector<NodeIndex> result;
+        std::vector<SimpleMaxFlow::NodeIndex> result;
         self.GetSourceSideMinCut(&result);
 
         Array ret;
         for (const auto& it : result) {
-          ret.push(it);
+          ret.push(it, false);
         }
         return ret;
       })
     .define_method(
       "sink_side_min_cut",
       [](SimpleMaxFlow& self) {
-        std::vector<NodeIndex> result;
+        std::vector<SimpleMaxFlow::NodeIndex> result;
         self.GetSinkSideMinCut(&result);
 
         Array ret;
         for (const auto& it : result) {
-          ret.push(it);
+          ret.push(it, false);
         }
         return ret;
       });

data/ext/or-tools/routing.cpp

@@ -36,20 +36,34 @@ namespace Rice::detail {
   template<>
   class From_Ruby<RoutingNodeIndex> {
   public:
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
     Convertible is_convertible(VALUE value) { return Convertible::Cast; }
 
     RoutingNodeIndex convert(VALUE x) {
       const RoutingNodeIndex index{From_Ruby<int>().convert(x)};
       return index;
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
 
   template<>
   class To_Ruby<RoutingNodeIndex> {
   public:
+    To_Ruby() = default;
+
+    explicit To_Ruby(Arg* arg) : arg_(arg) { }
+
     VALUE convert(RoutingNodeIndex const & x) {
       return To_Ruby<int>().convert(x.value());
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
 } // namespace Rice::detail
 
@@ -62,7 +76,7 @@ void init_routing(Rice::Module& m) {
   rb_cRoutingSearchParameters
     .define_method(
       "first_solution_strategy=",
-      [](RoutingSearchParameters& self, Symbol value) {
+      [](RoutingSearchParameters& self, Object value) {
         auto s = Symbol(value).str();
 
         FirstSolutionStrategy::Value v;
@@ -102,7 +116,7 @@ void init_routing(Rice::Module& m) {
       })
     .define_method(
       "local_search_metaheuristic=",
-      [](RoutingSearchParameters& self, Symbol value) {
+      [](RoutingSearchParameters& self, Object value) {
         auto s = Symbol(value).str();
 
         LocalSearchMetaheuristic::Value v;

data/ext/or-tools/vendor.rb

@@ -3,18 +3,18 @@ require "fileutils"
 require "net/http"
 require "tmpdir"
 
-version = "9.12.4544"
+version = "9.14.6206"
 
 arch = RbConfig::CONFIG["host_cpu"]
 arm = arch.match?(/arm|aarch64/i)
 
 if RbConfig::CONFIG["host_os"].match?(/darwin/i)
   if arm
-    filename = "or-tools_arm64_macOS-15.3.1_cpp_v#{version}.tar.gz"
-    checksum = "02f89e54bd8d86e6e069f843aeed10a444ff329052e5a7fd732c5e4ec4f845fb"
+    filename = "or-tools_arm64_macOS-15.5_cpp_v#{version}.tar.gz"
+    checksum = "7dd3fc35acc74a85f44e39099dcc2caa698d7a99e659e8d8456ce25bafe4a63b"
   else
-    filename = "or-tools_x86_64_macOS-15.3.1_cpp_v#{version}.tar.gz"
-    checksum = "515af60e73e7fa620bab7f4a7d60b9069075d814453d91906aa39993d714f28d"
+    filename = "or-tools_x86_64_macOS-15.5_cpp_v#{version}.tar.gz"
+    checksum = "de7ed91b0fe90094fb5f5ebd19869b69a8d52b9752e456752208a22a05b14f7f"
   end
 else
   # try /etc/os-release with fallback to /usr/lib/os-release
@@ -29,22 +29,22 @@ else
 
   if os == "ubuntu" && os_version == "24.04" && !arm
     filename = "or-tools_amd64_ubuntu-24.04_cpp_v#{version}.tar.gz"
-    checksum = "71128e095024707bf9835faf4558cbe34acb79345e899bd532f3008a493a8970"
+    checksum = "be3855a32a7390c3957d43ebd3faec1610acdc28f06ef33cb50f1f72a9aa6621"
   elsif os == "ubuntu" && os_version == "22.04" && !arm
     filename = "or-tools_amd64_ubuntu-22.04_cpp_v#{version}.tar.gz"
-    checksum = "cb42ea7d7799a01fea7cdaafacbdfc67180d85f39532c6d2a8c4cfb419bd07ed"
+    checksum = "127a82bbbf304d26721bb9b41ecce2d66f21c757204ab5aa2cc37eaa6ffb7eb6"
   elsif os == "ubuntu" && os_version == "20.04" && !arm
     filename = "or-tools_amd64_ubuntu-20.04_cpp_v#{version}.tar.gz"
-    checksum = "ea51589fe80bd9cd4fb6203bd1e956b311cdb1d21bbd14f7b6dad75c81d3583c"
-  elsif os == "debian" && os_version == "11" && !arm
-    filename = "or-tools_amd64_debian-11_cpp_v#{version}.tar.gz"
-    checksum = "dcee63b726569bd99c134e0e920173f955feae5856c3370a0bed03fdc995af50"
+    checksum = "7705a7c11e0db4ec1d7841e184acd204787174c6cbdb2fbd81169823ed148c6c"
   elsif os == "debian" && os_version == "12" && !arm
     filename = "or-tools_amd64_debian-12_cpp_v#{version}.tar.gz"
-    checksum = "911143f50fe013fbd50d0dce460512106596adfc0f2ad9a2bc8afd218531bde4"
+    checksum = "285e8ec3a3399e45cdb4f67f48d4b65dbfa9c013b29036d409c72f96f0f34ab9"
+  elsif os == "debian" && os_version == "11" && !arm
+    filename = "or-tools_amd64_debian-11_cpp_v#{version}.tar.gz"
+    checksum = "646b53e8d355290c4627d6bad0d36baeff38dc43605d317ac02cb811688d4dd2"
   elsif os == "arch" && !arm
     filename = "or-tools_amd64_archlinux_cpp_v#{version}.tar.gz"
-    checksum = "18c1d929e2144e9d9602659ea2fa790bd2a150f72c32c38a97f571839816d132"
+    checksum = "6be039a13c3be7a3dbcdc413d455b43bba4590ce38859062898835effefb5ca4"
   else
     platform =
       if Gem.win_platform?
@@ -127,14 +127,6 @@ Dir.mktmpdir do |extract_path|
   tar_args = Gem.win_platform? ? ["--force-local"] : []
   system "tar", "zxf", download_path, "-C", extract_path, "--strip-components=1", *tar_args
 
-  # licenses
-  license_files = Dir.glob("**/*{LICENSE,LICENCE,NOTICE,COPYING,license,licence,notice,copying}*", base: extract_path)
-  raise "License not found" unless license_files.any?
-  license_files.each do |file|
-    FileUtils.mkdir_p(File.join(path, File.dirname(file)))
-    FileUtils.mv(File.join(extract_path, file), File.join(path, file))
-  end
-
   # include
   FileUtils.mv(File.join(extract_path, "include"), File.join(path, "include"))
 
@@ -144,6 +136,14 @@ Dir.mktmpdir do |extract_path|
     next if file.include?("libprotoc.")
     FileUtils.mv(File.join(extract_path, file), File.join(path, file))
   end
+
+  # licenses
+  license_files = Dir.glob("**/*{LICENSE,LICENCE,NOTICE,COPYING,license,licence,notice,copying}*", base: extract_path)
+  raise "License not found" unless license_files.any?
+  license_files.each do |file|
+    FileUtils.mkdir_p(File.join(path, File.dirname(file)))
+    FileUtils.mv(File.join(extract_path, file), File.join(path, file))
+  end
 end
 
 # export

data/lib/or_tools/version.rb

@@ -1,3 +1,3 @@
 module ORTools
-  VERSION = "0.15.1"
+  VERSION = "0.16.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.1
 platform: ruby
 authors:
 - Andrew Kane
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '4.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '4.7'
 email: andrew@ankane.org
 executables: []
 extensions:
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Operations research tools for Ruby
 test_files: []