or-tools 0.16.0 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2c9e5edffd049efefd022fbb2d8473e922adb0d2d4bc7ca03fa87ec823929be
-  data.tar.gz: 9825d9ab9fe616f263a8c5bfa23f57795fee798c486ef6ad6aa34bd4c47a5dac
+  metadata.gz: 63a926d63d95220ccee1d6861a26fdc96787a209210cf8473bc44855cb62f57d
+  data.tar.gz: 90a2bd6c3f72e759e22c104cfba792c39352d9908f3735fc17ca3ef15ca156db
 SHA512:
-  metadata.gz: 53958c2e8aff5a55240cc19b8423d5c6cd8244214b26a79d969fe920f8faab2ad354ff7ef62039b05071d7b166436696152ffd141dff68451f8c09f8d119d83f
-  data.tar.gz: 7abb3a8c5507f11796743b505351f285cbad89ab366fda35ae6b084f1835dcab8905f02fcb91e091bbeb142d097a8b314aadddc51a94d8285d257b6601e2e769
+  metadata.gz: b73722ccaa5d9700513c633dce30fa73d748431790c45c6bc77afa50375322c312578de81cd90128bfc0d2f0baff289094dba555e81c4dcbfb4137fb427add85
+  data.tar.gz: 99d4db8c29b87db1e6697b1c8e5bb6475ea41e4ec7c85f05ab9ee0510c5484614d055745704a7b7ba1d3c39930bf8bcf1a98174ad68ec0ca197dac70deb72eb9

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.16.2 (2026-01-02)
+
+- Fixed error with Rice 4.8
+
+## 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

data/ext/or-tools/bin_packing.cpp

@@ -20,7 +20,11 @@ namespace Rice::detail {
   template<>
   class From_Ruby<KnapsackSolver::SolverType> {
   public:
-    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
+    double is_convertible(VALUE value) { return Convertible::Exact; }
 
     KnapsackSolver::SolverType convert(VALUE x) {
       auto s = Symbol(x).str();
@@ -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,7 +40,11 @@ namespace Rice::detail {
   template<>
   class From_Ruby<LinearExpr> {
   public:
-    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
+    double is_convertible(VALUE value) { return Convertible::Exact; }
 
     LinearExpr convert(VALUE v) {
       LinearExpr expr;
@@ -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,7 +26,11 @@ namespace Rice::detail {
 
   template<>
   struct From_Ruby<MPSolver::OptimizationProblemType> {
-    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
+    double is_convertible(VALUE value) { return Convertible::Exact; }
 
     static MPSolver::OptimizationProblemType convert(VALUE x) {
       auto s = Symbol(x).str();
@@ -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,7 +25,11 @@ namespace Rice::detail {
 
   template<>
   struct From_Ruby<SolverType> {
-    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
+    double is_convertible(VALUE value) { return Convertible::Exact; }
 
     static SolverType convert(VALUE x) {
       auto s = Symbol(x).str();
@@ -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

@@ -47,7 +47,7 @@ void init_network_flows(Rice::Module& m) {
 
         Array ret;
         for (const auto& it : result) {
-          ret.push(it);
+          ret.push(it, false);
         }
         return ret;
       })
@@ -59,7 +59,7 @@ void init_network_flows(Rice::Module& m) {
 
         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,63 @@ namespace Rice::detail {
   template<>
   class From_Ruby<RoutingNodeIndex> {
   public:
-    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
+    double is_convertible(VALUE value) { return Convertible::Exact; }
 
     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;
+  };
+
+  template<>
+  struct Type<RoutingModel::PenaltyCostBehavior> {
+    static bool verify() { return true; }
+  };
+
+  template<>
+  class From_Ruby<RoutingModel::PenaltyCostBehavior> {
+  public:
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
+    double is_convertible(VALUE value) { return Convertible::Exact; }
+
+    RoutingModel::PenaltyCostBehavior convert(VALUE x) {
+      auto s = Symbol(x).str();
+      if (s == "penalize_once") {
+        return RoutingModel::PenaltyCostBehavior::PENALIZE_ONCE;
+      } else if (s == "penalize_per_inactive") {
+        return RoutingModel::PenaltyCostBehavior::PENALIZE_PER_INACTIVE;
+      } else {
+        throw std::runtime_error("Unknown penalty cost behavior: " + s);
+      }
+    }
+
+  private:
+    Arg* arg_ = nullptr;
   };
 } // namespace Rice::detail
 
@@ -62,7 +105,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 +145,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;
@@ -333,7 +376,7 @@ void init_routing(Rice::Module& m) {
     .define_method("add_resource_group", &RoutingModel::AddResourceGroup)
     .define_method("dimension_resource_group_indices", &RoutingModel::GetDimensionResourceGroupIndices)
     .define_method("dimension_resource_group_index", &RoutingModel::GetDimensionResourceGroupIndex)
-    .define_method("add_disjunction", &RoutingModel::AddDisjunction, Rice::Arg("_indices"), Rice::Arg("_penalty"), Rice::Arg("_max_cardinality") = static_cast<int64_t>(1), Rice::Arg("_penalty_cost_behavior") = RoutingModel::PenaltyCostBehavior::PENALIZE_ONCE)
+    .define_method("_add_disjunction", &RoutingModel::AddDisjunction)
     .define_method("disjunction_indices", &RoutingModel::GetDisjunctionIndices)
     .define_method("disjunction_penalty", &RoutingModel::GetDisjunctionPenalty)
     .define_method("disjunction_max_cardinality", &RoutingModel::GetDisjunctionMaxCardinality)

data/ext/or-tools/vendor.rb

@@ -36,12 +36,12 @@ else
   elsif os == "ubuntu" && os_version == "20.04" && !arm
     filename = "or-tools_amd64_ubuntu-20.04_cpp_v#{version}.tar.gz"
     checksum = "7705a7c11e0db4ec1d7841e184acd204787174c6cbdb2fbd81169823ed148c6c"
-  elsif os == "debian" && os_version == "11" && !arm
-    filename = "or-tools_amd64_debian-11_cpp_v#{version}.tar.gz"
-    checksum = "646b53e8d355290c4627d6bad0d36baeff38dc43605d317ac02cb811688d4dd2"
   elsif os == "debian" && os_version == "12" && !arm
     filename = "or-tools_amd64_debian-12_cpp_v#{version}.tar.gz"
     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 = "6be039a13c3be7a3dbcdc413d455b43bba4590ce38859062898835effefb5ca4"

data/lib/or_tools/routing_model.rb

@@ -17,5 +17,9 @@ module ORTools
       search_parameters.log_search = log_search unless log_search.nil?
       solve_with_parameters(search_parameters)
     end
+
+    def add_disjunction(indices, penalty, max_cardinality = 1, penalty_cost_behavior = :penalize_once)
+      _add_disjunction(indices, penalty, max_cardinality, penalty_cost_behavior)
+    end
   end
 end

data/lib/or_tools/version.rb

@@ -1,3 +1,3 @@
 module ORTools
-  VERSION = "0.16.0"
+  VERSION = "0.16.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.2
 platform: ruby
 authors:
 - Andrew Kane
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '4.8'
 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: 4.0.3
 specification_version: 4
 summary: Operations research tools for Ruby
 test_files: []