or-tools 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea0dcf083694be566f08e7c531e3bbd7cd817fb454c6590a1edff5411e58b9c7
-  data.tar.gz: 334369dda3337181b10722f96a52211a079f29409e709a8bfd6685a3d9100916
+  metadata.gz: a2c9e5edffd049efefd022fbb2d8473e922adb0d2d4bc7ca03fa87ec823929be
+  data.tar.gz: 9825d9ab9fe616f263a8c5bfa23f57795fee798c486ef6ad6aa34bd4c47a5dac
 SHA512:
-  metadata.gz: 2d8956c463c473ceabe4803f23076d8c96617a4abbd64b7bc2873492bd9e41eed50929567ae71acdf42ea42c8bbbaf4716b132f27eae56cb307f311692444fa3
-  data.tar.gz: 4ca6955eb037764eae4fc99861b904298c9bb519bc5ff2a19d5709f24f2f1e3de72f3827a953c90f9e006bc5122dc122ff51ece505784b5b3db49d5a0aaa8a5e
+  metadata.gz: 53958c2e8aff5a55240cc19b8423d5c6cd8244214b26a79d969fe920f8faab2ad354ff7ef62039b05071d7b166436696152ffd141dff68451f8c09f8d119d83f
+  data.tar.gz: 7abb3a8c5507f11796743b505351f285cbad89ab366fda35ae6b084f1835dcab8905f02fcb91e091bbeb142d097a8b314aadddc51a94d8285d257b6601e2e769

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.16.0 (2025-06-19)
+
+- Updated OR-Tools to 9.14
+
+## 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,9 +1,10 @@
+#include <vector>
+
 #include <ortools/graph/max_flow.h>
 #include <ortools/graph/min_cost_flow.h>
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
-#include "ext.h"
-
-using operations_research::NodeIndex;
 using operations_research::SimpleMaxFlow;
 using operations_research::SimpleMinCostFlow;
 
@@ -23,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) {
@@ -41,7 +42,7 @@ 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;
@@ -53,7 +54,7 @@ void init_network_flows(Rice::Module& m) {
     .define_method(
       "sink_side_min_cut",
       [](SimpleMaxFlow& self) {
-        std::vector<NodeIndex> result;
+        std::vector<SimpleMaxFlow::NodeIndex> result;
         self.GetSinkSideMinCut(&result);
 
         Array ret;

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/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"
+    checksum = "7705a7c11e0db4ec1d7841e184acd204787174c6cbdb2fbd81169823ed148c6c"
   elsif os == "debian" && os_version == "11" && !arm
     filename = "or-tools_amd64_debian-11_cpp_v#{version}.tar.gz"
-    checksum = "dcee63b726569bd99c134e0e920173f955feae5856c3370a0bed03fdc995af50"
+    checksum = "646b53e8d355290c4627d6bad0d36baeff38dc43605d317ac02cb811688d4dd2"
   elsif os == "debian" && os_version == "12" && !arm
     filename = "or-tools_amd64_debian-12_cpp_v#{version}.tar.gz"
-    checksum = "911143f50fe013fbd50d0dce460512106596adfc0f2ad9a2bc8afd218531bde4"
+    checksum = "285e8ec3a3399e45cdb4f67f48d4b65dbfa9c013b29036d409c72f96f0f34ab9"
   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/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.16.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 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>