or-tools 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea0dcf083694be566f08e7c531e3bbd7cd817fb454c6590a1edff5411e58b9c7
-  data.tar.gz: 334369dda3337181b10722f96a52211a079f29409e709a8bfd6685a3d9100916
+  metadata.gz: cf6aeeb8a03deeb23478d655a7844b3e49115252fd8ad5cc7285074370580952
+  data.tar.gz: 67db36ddc806b7a2695ea89c9bb2dc3969161df739059e186aed6d67506c4348
 SHA512:
-  metadata.gz: 2d8956c463c473ceabe4803f23076d8c96617a4abbd64b7bc2873492bd9e41eed50929567ae71acdf42ea42c8bbbaf4716b132f27eae56cb307f311692444fa3
-  data.tar.gz: 4ca6955eb037764eae4fc99861b904298c9bb519bc5ff2a19d5709f24f2f1e3de72f3827a953c90f9e006bc5122dc122ff51ece505784b5b3db49d5a0aaa8a5e
+  metadata.gz: 65d8e93c059aa9df5501d8db5252279ede1b85601785663ff0ff41a9e1b5555976c5b9a4304ebfe557d9e9e7802ba30635644b8b857c219e4c925db4d18d8e24
+  data.tar.gz: 3a76c22bc257260861751d79a79cb94f880c4d8f5c82ab7b00d249da586ef05283c031f8517ca77621848b0e0fdc6993e1c81ac9f116d2cae50073dd25177109

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.15.1 (2025-06-18)
+
+- Fixed error with Rice 4.6
+
 ## 0.15.0 (2025-02-17)
 
 - Updated OR-Tools to 9.12

data/NOTICE.txt

@@ -1,5 +1,5 @@
-Copyright 2010-2021 Google LLC
-Copyright 2020-2022 Andrew Kane
+Copyright 2010-2025 Google LLC
+Copyright 2020-2025 Andrew Kane
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/ext/or-tools/assignment.cpp

@@ -1,6 +1,6 @@
 #include <ortools/graph/assignment.h>
-
-#include "ext.h"
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 using operations_research::SimpleLinearSumAssignment;
 

data/ext/or-tools/bin_packing.cpp

@@ -1,6 +1,9 @@
-#include <ortools/algorithms/knapsack_solver.h>
+#include <string>
+#include <vector>
 
-#include "ext.h"
+#include <ortools/algorithms/knapsack_solver.h>
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 using operations_research::KnapsackSolver;
 
@@ -8,22 +11,18 @@ using Rice::Array;
 using Rice::Object;
 using Rice::Symbol;
 
-namespace Rice::detail
-{
+namespace Rice::detail {
   template<>
-  struct Type<KnapsackSolver::SolverType>
-  {
+  struct Type<KnapsackSolver::SolverType> {
     static bool verify() { return true; }
   };
 
   template<>
-  class From_Ruby<KnapsackSolver::SolverType>
-  {
+  class From_Ruby<KnapsackSolver::SolverType> {
   public:
     Convertible is_convertible(VALUE value) { return Convertible::Cast; }
 
-    KnapsackSolver::SolverType convert(VALUE x)
-    {
+    KnapsackSolver::SolverType convert(VALUE x) {
       auto s = Symbol(x).str();
       if (s == "branch_and_bound") {
         return KnapsackSolver::KNAPSACK_MULTIDIMENSION_BRANCH_AND_BOUND_SOLVER;
@@ -32,7 +31,7 @@ namespace Rice::detail
       }
     }
   };
-}
+} // namespace Rice::detail
 
 void init_bin_packing(Rice::Module& m) {
   Rice::define_class_under<KnapsackSolver>(m, "KnapsackSolver")

data/ext/or-tools/constraint.cpp

@@ -1,7 +1,10 @@
+#include <string>
+#include <vector>
+
 #include <google/protobuf/text_format.h>
 #include <ortools/sat/cp_model.h>
-
-#include "ext.h"
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 using operations_research::Domain;
 using operations_research::sat::BoolVar;
@@ -27,22 +30,18 @@ using Rice::Symbol;
 Class rb_cBoolVar;
 Class rb_cSatIntVar;
 
-namespace Rice::detail
-{
+namespace Rice::detail {
   template<>
-  struct Type<LinearExpr>
-  {
+  struct Type<LinearExpr> {
     static bool verify() { return true; }
   };
 
   template<>
-  class From_Ruby<LinearExpr>
-  {
+  class From_Ruby<LinearExpr> {
   public:
     Convertible is_convertible(VALUE value) { return Convertible::Cast; }
 
-    LinearExpr convert(VALUE v)
-    {
+    LinearExpr convert(VALUE v) {
       LinearExpr expr;
 
       Rice::Object utils = Rice::define_module("ORTools").const_get("Utils");
@@ -64,7 +63,7 @@ namespace Rice::detail
       return expr;
     }
   };
-}
+} // namespace Rice::detail
 
 void init_constraint(Rice::Module& m) {
   Rice::define_class_under<Domain>(m, "Domain")

data/ext/or-tools/ext.cpp

@@ -1,7 +1,7 @@
 #include <ortools/base/version.h>
 #include <ortools/init/init.h>
-
-#include "ext.h"
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 using operations_research::CppBridge;
 using operations_research::CppFlags;
@@ -15,8 +15,7 @@ void init_network_flows(Rice::Module& m);
 void init_routing(Rice::Module& m);
 
 extern "C"
-void Init_ext()
-{
+void Init_ext() {
   auto m = Rice::define_module("ORTools");
 
   m.define_singleton_function("lib_version", &operations_research::OrToolsVersionString);

data/ext/or-tools/linear.cpp

@@ -1,6 +1,9 @@
-#include <ortools/linear_solver/linear_solver.h>
+#include <memory>
+#include <string>
 
-#include "ext.h"
+#include <ortools/linear_solver/linear_solver.h>
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 using operations_research::MPConstraint;
 using operations_research::MPObjective;
@@ -15,21 +18,17 @@ using Rice::Object;
 using Rice::String;
 using Rice::Symbol;
 
-namespace Rice::detail
-{
+namespace Rice::detail {
   template<>
-  struct Type<MPSolver::OptimizationProblemType>
-  {
+  struct Type<MPSolver::OptimizationProblemType> {
     static bool verify() { return true; }
   };
 
   template<>
-  struct From_Ruby<MPSolver::OptimizationProblemType>
-  {
+  struct From_Ruby<MPSolver::OptimizationProblemType> {
     Convertible is_convertible(VALUE value) { return Convertible::Cast; }
 
-    static MPSolver::OptimizationProblemType convert(VALUE x)
-    {
+    static MPSolver::OptimizationProblemType convert(VALUE x) {
       auto s = Symbol(x).str();
       if (s == "glop") {
         return MPSolver::OptimizationProblemType::GLOP_LINEAR_PROGRAMMING;
@@ -40,7 +39,7 @@ namespace Rice::detail
       }
     }
   };
-}
+} // namespace Rice::detail
 
 void init_linear(Rice::Module& m) {
   Rice::define_class_under<MPVariable>(m, "MPVariable")

data/ext/or-tools/math_opt.cpp

@@ -1,9 +1,11 @@
-#include "absl/log/check.h"
-#include "absl/status/statusor.h"
-#include "ortools/base/init_google.h"
-#include "ortools/math_opt/cpp/math_opt.h"
+#include <string>
 
-#include "ext.h"
+#include <absl/log/check.h>
+#include <absl/status/statusor.h>
+#include <ortools/base/init_google.h>
+#include <ortools/math_opt/cpp/math_opt.h>
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 using operations_research::math_opt::LinearConstraint;
 using operations_research::math_opt::Model;
@@ -15,21 +17,17 @@ using operations_research::math_opt::Termination;
 using operations_research::math_opt::TerminationReason;
 using operations_research::math_opt::Variable;
 
-namespace Rice::detail
-{
+namespace Rice::detail {
   template<>
-  struct Type<SolverType>
-  {
+  struct Type<SolverType> {
     static bool verify() { return true; }
   };
 
   template<>
-  struct From_Ruby<SolverType>
-  {
+  struct From_Ruby<SolverType> {
     Convertible is_convertible(VALUE value) { return Convertible::Cast; }
 
-    static SolverType convert(VALUE x)
-    {
+    static SolverType convert(VALUE x) {
       auto s = Symbol(x).str();
       if (s == "gscip") {
         return SolverType::kGscip;
@@ -56,7 +54,7 @@ namespace Rice::detail
       }
     }
   };
-}
+} // namespace Rice::detail
 
 void init_math_opt(Rice::Module& m) {
   auto mathopt = Rice::define_module_under(m, "MathOpt");
@@ -67,7 +65,7 @@ void init_math_opt(Rice::Module& m) {
     .define_method(
       "_eql?",
       [](Variable& self, Variable &other) {
-        return (bool) (self == other);
+        return static_cast<bool>(self == other);
       });
 
   Rice::define_class_under<LinearConstraint>(mathopt, "LinearConstraint");

data/ext/or-tools/network_flows.cpp

@@ -1,7 +1,9 @@
+#include <vector>
+
 #include <ortools/graph/max_flow.h>
 #include <ortools/graph/min_cost_flow.h>
-
-#include "ext.h"
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 using operations_research::NodeIndex;
 using operations_research::SimpleMaxFlow;

data/ext/or-tools/routing.cpp

@@ -1,7 +1,10 @@
+#include <string>
+#include <vector>
+
 #include <ortools/constraint_solver/routing.h>
 #include <ortools/constraint_solver/routing_parameters.h>
-
-#include "ext.h"
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 using operations_research::Assignment;
 using operations_research::ConstraintSolverParameters;
@@ -24,37 +27,31 @@ using Rice::Object;
 using Rice::String;
 using Rice::Symbol;
 
-namespace Rice::detail
-{
+namespace Rice::detail {
   template<>
-  struct Type<RoutingNodeIndex>
-  {
+  struct Type<RoutingNodeIndex> {
     static bool verify() { return true; }
   };
 
   template<>
-  class From_Ruby<RoutingNodeIndex>
-  {
+  class From_Ruby<RoutingNodeIndex> {
   public:
     Convertible is_convertible(VALUE value) { return Convertible::Cast; }
 
-    RoutingNodeIndex convert(VALUE x)
-    {
+    RoutingNodeIndex convert(VALUE x) {
       const RoutingNodeIndex index{From_Ruby<int>().convert(x)};
       return index;
     }
   };
 
   template<>
-  class To_Ruby<RoutingNodeIndex>
-  {
+  class To_Ruby<RoutingNodeIndex> {
   public:
-    VALUE convert(RoutingNodeIndex const & x)
-    {
+    VALUE convert(RoutingNodeIndex const & x) {
       return To_Ruby<int>().convert(x.value());
     }
   };
-}
+} // namespace Rice::detail
 
 void init_routing(Rice::Module& m) {
   auto rb_cRoutingSearchParameters = Rice::define_class_under<RoutingSearchParameters>(m, "RoutingSearchParameters");
@@ -253,7 +250,11 @@ void init_routing(Rice::Module& m) {
       })
     .define_method(
       "cumulative",
-      [](operations_research::Solver& self, std::vector<operations_research::IntervalVar*> intervals, std::vector<int64_t> demands, int64_t capacity, const std::string& name) {
+      [](operations_research::Solver& self, Array rb_intervals, std::vector<int64_t> demands, int64_t capacity, const std::string& name) {
+        std::vector<operations_research::IntervalVar*> intervals;
+        for (const Object v : rb_intervals) {
+          intervals.push_back(Rice::detail::From_Ruby<operations_research::IntervalVar*>().convert(v.value()));
+        }
         return self.MakeCumulative(intervals, demands, capacity, name);
       });
 
@@ -332,7 +333,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") = (int64_t)1, Rice::Arg("_penalty_cost_behavior") = RoutingModel::PenaltyCostBehavior::PENALIZE_ONCE)
+    .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("disjunction_indices", &RoutingModel::GetDisjunctionIndices)
     .define_method("disjunction_penalty", &RoutingModel::GetDisjunctionPenalty)
     .define_method("disjunction_max_cardinality", &RoutingModel::GetDisjunctionMaxCardinality)

data/lib/or_tools/routing_model.rb

@@ -1,9 +1,13 @@
 module ORTools
   class RoutingModel
-    def solve(solution_limit: nil, time_limit: nil, lns_time_limit: nil,
-      first_solution_strategy: nil, local_search_metaheuristic: nil,
-      log_search: nil)
-
+    def solve(
+      solution_limit: nil,
+      time_limit: nil,
+      lns_time_limit: nil,
+      first_solution_strategy: nil,
+      local_search_metaheuristic: nil,
+      log_search: nil
+    )
       search_parameters = ORTools.default_routing_search_parameters
       search_parameters.solution_limit = solution_limit if solution_limit
       search_parameters.time_limit = time_limit if time_limit

data/lib/or_tools/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Andrew Kane
 bindir: bin
 cert_chain: []
-date: 2025-02-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: 4.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: 4.5.0
 email: andrew@ankane.org
 executables: []
 extensions:
@@ -37,7 +37,6 @@ files:
 - ext/or-tools/bin_packing.cpp
 - ext/or-tools/constraint.cpp
 - ext/or-tools/ext.cpp
-- ext/or-tools/ext.h
 - ext/or-tools/extconf.rb
 - ext/or-tools/linear.cpp
 - ext/or-tools/math_opt.cpp
@@ -86,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Operations research tools for Ruby
 test_files: []

data/ext/or-tools/ext.h

@@ -1,4 +0,0 @@
-#pragma once
-
-#include <rice/rice.hpp>
-#include <rice/stl.hpp>