or-tools 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dee4a87960e33b5a357e9549cac01fadbbed11aa0e7b8fda11355383f01f853c
-  data.tar.gz: 5cb68b2fb6beb48cf73f5d78fc14930a274da58bf8c743d5199588b4283bd3c7
+  metadata.gz: 63a926d63d95220ccee1d6861a26fdc96787a209210cf8473bc44855cb62f57d
+  data.tar.gz: 90a2bd6c3f72e759e22c104cfba792c39352d9908f3735fc17ca3ef15ca156db
 SHA512:
-  metadata.gz: ab8788f734a9b525c9d7f385fc32947430c9727aec659a5f898436159a8e90684031508fb5f6bf099381821ff184344f101a52c90e23f716a2bf46f91e7e78e1
-  data.tar.gz: 5b90c3c913f171e464da6c162659a7e4fc896fa30f6996e21d145b07f93d4a925d71af71d1ddee2eab27f1850545715abd2016bb52f6b6151badc06eb8a6f37a
+  metadata.gz: b73722ccaa5d9700513c633dce30fa73d748431790c45c6bc77afa50375322c312578de81cd90128bfc0d2f0baff289094dba555e81c4dcbfb4137fb427add85
+  data.tar.gz: 99d4db8c29b87db1e6697b1c8e5bb6475ea41e4ec7c85f05ab9ee0510c5484614d055745704a7b7ba1d3c39930bf8bcf1a98174ad68ec0ca197dac70deb72eb9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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`

data/ext/or-tools/bin_packing.cpp

@@ -24,7 +24,7 @@ namespace Rice::detail {
 
     explicit From_Ruby(Arg* arg) : arg_(arg) { }
 
-    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+    double is_convertible(VALUE value) { return Convertible::Exact; }
 
     KnapsackSolver::SolverType convert(VALUE x) {
       auto s = Symbol(x).str();

data/ext/or-tools/constraint.cpp

@@ -44,7 +44,7 @@ namespace Rice::detail {
 
     explicit From_Ruby(Arg* arg) : arg_(arg) { }
 
-    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+    double is_convertible(VALUE value) { return Convertible::Exact; }
 
     LinearExpr convert(VALUE v) {
       LinearExpr expr;

data/ext/or-tools/linear.cpp

@@ -30,7 +30,7 @@ namespace Rice::detail {
 
     explicit From_Ruby(Arg* arg) : arg_(arg) { }
 
-    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+    double is_convertible(VALUE value) { return Convertible::Exact; }
 
     static MPSolver::OptimizationProblemType convert(VALUE x) {
       auto s = Symbol(x).str();

data/ext/or-tools/math_opt.cpp

@@ -29,7 +29,7 @@ namespace Rice::detail {
 
     explicit From_Ruby(Arg* arg) : arg_(arg) { }
 
-    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+    double is_convertible(VALUE value) { return Convertible::Exact; }
 
     static SolverType convert(VALUE x) {
       auto s = Symbol(x).str();

data/ext/or-tools/routing.cpp

@@ -40,7 +40,7 @@ namespace Rice::detail {
 
     explicit From_Ruby(Arg* arg) : arg_(arg) { }
 
-    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+    double is_convertible(VALUE value) { return Convertible::Exact; }
 
     RoutingNodeIndex convert(VALUE x) {
       const RoutingNodeIndex index{From_Ruby<int>().convert(x)};
@@ -65,6 +65,35 @@ namespace Rice::detail {
   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
 
 void init_routing(Rice::Module& m) {
@@ -347,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/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.1"
+  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.1
+  version: 0.16.2
 platform: ruby
 authors:
 - Andrew Kane
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.7'
+        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.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Operations research tools for Ruby
 test_files: []