or-tools 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5803be6e2ff6de980c6f1a89ab9ccda1e2ee264139229bca865103c8379dc4a2
-  data.tar.gz: 323fda85d36cc8dadb6720a23ac3e9eaa881e3618e74044c8b04773bb979c16e
+  metadata.gz: ea0dcf083694be566f08e7c531e3bbd7cd817fb454c6590a1edff5411e58b9c7
+  data.tar.gz: 334369dda3337181b10722f96a52211a079f29409e709a8bfd6685a3d9100916
 SHA512:
-  metadata.gz: 48c9eba03b16bb2ce63edf62d52f33fc88595e691543f68dd1a2090adb7212958331534a97b801c7f54acce6626461bc0e268ac312ea34c1c50045dedcfbb3b4
-  data.tar.gz: 8d91150d41201f8e47129ef3b48cfb4b63b5cb91c09c87d7ef01f87de4b82ff6d287fb2ca5e3b5a4984152bdb2e5a33f4c5b8fe9495d6a9e89ab81b31c1674ac
+  metadata.gz: 2d8956c463c473ceabe4803f23076d8c96617a4abbd64b7bc2873492bd9e41eed50929567ae71acdf42ea42c8bbbaf4716b132f27eae56cb307f311692444fa3
+  data.tar.gz: 4ca6955eb037764eae4fc99861b904298c9bb519bc5ff2a19d5709f24f2f1e3de72f3827a953c90f9e006bc5122dc122ff51ece505784b5b3db49d5a0aaa8a5e

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.15.0 (2025-02-17)
+
+- Updated OR-Tools to 9.12
+- Removed `pickup_positions` and `pickup_index_pairs` (use `pickup_position` instead)
+- Removed `delivery_positions` and `delivery_index_pairs` (use `delivery_position` instead)
+
+## 0.14.2 (2025-02-10)
+
+- Fixed error with Rice 4.5
+
 ## 0.14.1 (2024-12-04)
 
 - Added support for parameters to `Solver`

data/ext/or-tools/bin_packing.cpp

@@ -13,16 +13,15 @@ namespace Rice::detail
   template<>
   struct Type<KnapsackSolver::SolverType>
   {
-    static bool verify()
-    {
-      return true;
-    }
+    static bool verify() { return true; }
   };
 
   template<>
   class From_Ruby<KnapsackSolver::SolverType>
   {
   public:
+    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+
     KnapsackSolver::SolverType convert(VALUE x)
     {
       auto s = Symbol(x).str();

data/ext/or-tools/constraint.cpp

@@ -32,16 +32,15 @@ namespace Rice::detail
   template<>
   struct Type<LinearExpr>
   {
-    static bool verify()
-    {
-      return true;
-    }
+    static bool verify() { return true; }
   };
 
   template<>
   class From_Ruby<LinearExpr>
   {
   public:
+    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+
     LinearExpr convert(VALUE v)
     {
       LinearExpr expr;

data/ext/or-tools/extconf.rb

@@ -1,6 +1,6 @@
 require "mkmf-rice"
 
-$CXXFLAGS << " -std=c++17 $(optflags) -DUSE_CBC"
+$CXXFLAGS << " -std=c++17 $(optflags) -DUSE_CBC -DOR_PROTO_DLL="
 
 # show warnings
 $CXXFLAGS << " -Wall -Wextra"
@@ -9,7 +9,7 @@ $CXXFLAGS << " -Wall -Wextra"
 $CXXFLAGS << " -Wno-sign-compare -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-missing-field-initializers"
 
 # hide Rice warnings
-$CXXFLAGS << " -Wno-implicit-fallthrough"
+$CXXFLAGS << " -Wno-unused-private-field -Wno-implicit-fallthrough"
 
 inc, lib = dir_config("or-tools")
 if inc || lib
@@ -32,10 +32,7 @@ end
 # find_header and find_library first check without adding path
 # which can cause them to find system library
 $INCFLAGS << " -I#{inc}"
-# could support shared libraries for protobuf and abseil
-# but keep simple for now
-raise "libprotobuf.a not found" unless File.exist?("#{lib}/libprotobuf.a")
-$LDFLAGS.prepend("-Wl,-rpath,#{rpath} -L#{lib} #{lib}/libprotobuf.a ")
+$LDFLAGS.prepend("-Wl,-rpath,#{rpath} -L#{lib} ")
 raise "OR-Tools not found" unless have_library("ortools")
 
 create_makefile("or_tools/ext")

data/ext/or-tools/linear.cpp

@@ -20,15 +20,14 @@ namespace Rice::detail
   template<>
   struct Type<MPSolver::OptimizationProblemType>
   {
-    static bool verify()
-    {
-      return true;
-    }
+    static bool verify() { return true; }
   };
 
   template<>
   struct From_Ruby<MPSolver::OptimizationProblemType>
   {
+    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+
     static MPSolver::OptimizationProblemType convert(VALUE x)
     {
       auto s = Symbol(x).str();
@@ -108,7 +107,13 @@ void init_linear(Rice::Module& m) {
       "presolve",
       [](MPSolverParameters& self) {
         int presolve = self.GetIntegerParam(MPSolverParameters::IntegerParam::PRESOLVE);
-        return presolve != MPSolverParameters::PresolveValues::PRESOLVE_OFF;
+        if (presolve == MPSolverParameters::PresolveValues::PRESOLVE_ON) {
+          return Rice::True;
+        } else if (presolve == MPSolverParameters::PresolveValues::PRESOLVE_OFF) {
+          return Rice::False;
+        } else {
+          return Rice::Nil;
+        }
       })
     .define_method(
       "incrementality=",
@@ -125,7 +130,13 @@ void init_linear(Rice::Module& m) {
       "incrementality",
       [](MPSolverParameters& self) {
         int incrementality = self.GetIntegerParam(MPSolverParameters::IntegerParam::INCREMENTALITY);
-        return incrementality != MPSolverParameters::IncrementalityValues::INCREMENTALITY_OFF;
+        if (incrementality == MPSolverParameters::IncrementalityValues::INCREMENTALITY_ON) {
+          return Rice::True;
+        } else if (incrementality == MPSolverParameters::IncrementalityValues::INCREMENTALITY_OFF) {
+          return Rice::False;
+        } else {
+          return Rice::Nil;
+        }
       })
     .define_method(
       "scaling=",
@@ -142,7 +153,13 @@ void init_linear(Rice::Module& m) {
       "scaling",
       [](MPSolverParameters& self) {
         int scaling = self.GetIntegerParam(MPSolverParameters::IntegerParam::SCALING);
-        return scaling != MPSolverParameters::ScalingValues::SCALING_OFF;
+        if (scaling == MPSolverParameters::ScalingValues::SCALING_ON) {
+          return Rice::True;
+        } else if (scaling == MPSolverParameters::ScalingValues::SCALING_OFF) {
+          return Rice::False;
+        } else {
+          return Rice::Nil;
+        }
       });
 
   Rice::define_class_under<MPSolver>(m, "Solver")

data/ext/or-tools/math_opt.cpp

@@ -20,15 +20,14 @@ namespace Rice::detail
   template<>
   struct Type<SolverType>
   {
-    static bool verify()
-    {
-      return true;
-    }
+    static bool verify() { return true; }
   };
 
   template<>
   struct From_Ruby<SolverType>
   {
+    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+
     static SolverType convert(VALUE x)
     {
       auto s = Symbol(x).str();

data/ext/or-tools/routing.cpp

@@ -15,6 +15,7 @@ using operations_research::RoutingModel;
 using operations_research::RoutingModelParameters;
 using operations_research::RoutingNodeIndex;
 using operations_research::RoutingSearchParameters;
+using operations_research::RoutingSearchStatus;
 
 using Rice::Array;
 using Rice::Class;
@@ -28,16 +29,15 @@ namespace Rice::detail
   template<>
   struct Type<RoutingNodeIndex>
   {
-    static bool verify()
-    {
-      return true;
-    }
+    static bool verify() { return true; }
   };
 
   template<>
   class From_Ruby<RoutingNodeIndex>
   {
   public:
+    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+
     RoutingNodeIndex convert(VALUE x)
     {
       const RoutingNodeIndex index{From_Ruby<int>().convert(x)};
@@ -285,7 +285,7 @@ void init_routing(Rice::Module& m) {
   Rice::define_class_under<RoutingModel::ResourceGroup>(m, "ResourceGroup");
 
   Rice::define_class_under<RoutingModel>(m, "RoutingModel")
-    .define_constructor(Rice::Constructor<RoutingModel, RoutingIndexManager, RoutingModelParameters>(), Rice::Arg("index_manager"), Rice::Arg("parameters") = operations_research::DefaultRoutingModelParameters())
+    .define_constructor(Rice::Constructor<RoutingModel, RoutingIndexManager, RoutingModelParameters>(), Rice::Arg("_index_manager"), Rice::Arg("_parameters") = operations_research::DefaultRoutingModelParameters())
     .define_method("register_unary_transit_vector", &RoutingModel::RegisterUnaryTransitVector)
     .define_method(
       "register_unary_transit_callback",
@@ -300,7 +300,7 @@ void init_routing(Rice::Module& m) {
             return Rice::detail::From_Ruby<int64_t>().convert(callback.call("call", from_index));
           }
         );
-      }, Rice::Arg("callback").keepAlive())
+      }, Rice::Arg("_callback").keepAlive())
     .define_method("register_transit_matrix", &RoutingModel::RegisterTransitMatrix)
     .define_method(
       "register_transit_callback",
@@ -315,7 +315,7 @@ void init_routing(Rice::Module& m) {
             return Rice::detail::From_Ruby<int64_t>().convert(callback.call("call", from_index, to_index));
           }
         );
-      }, Rice::Arg("callback").keepAlive())
+      }, Rice::Arg("_callback").keepAlive())
     .define_method("add_dimension", &RoutingModel::AddDimension)
     .define_method("add_dimension_with_vehicle_transits", &RoutingModel::AddDimensionWithVehicleTransits)
     .define_method("add_dimension_with_vehicle_capacity", &RoutingModel::AddDimensionWithVehicleCapacity)
@@ -332,7 +332,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)
+    .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("disjunction_indices", &RoutingModel::GetDisjunctionIndices)
     .define_method("disjunction_penalty", &RoutingModel::GetDisjunctionPenalty)
     .define_method("disjunction_max_cardinality", &RoutingModel::GetDisjunctionMaxCardinality)
@@ -347,22 +347,14 @@ void init_routing(Rice::Module& m) {
     .define_method("add_pickup_and_delivery", &RoutingModel::AddPickupAndDelivery)
     .define_method("add_pickup_and_delivery_sets", &RoutingModel::AddPickupAndDeliverySets)
     .define_method(
-      "pickup_positions",
+      "pickup_position",
       [](RoutingModel& self, int64_t node_index) {
-        std::vector<std::pair<int, int>> positions;
-        for (const auto& v : self.GetPickupPositions(node_index)) {
-          positions.emplace_back(v.pd_pair_index, v.alternative_index);
-        }
-        return positions;
+        return self.GetPickupPosition(node_index);
       })
     .define_method(
-      "delivery_positions",
+      "delivery_position",
       [](RoutingModel& self, int64_t node_index) {
-        std::vector<std::pair<int, int>> positions;
-        for (const auto& v : self.GetDeliveryPositions(node_index)) {
-          positions.emplace_back(v.pd_pair_index, v.alternative_index);
-        }
-        return positions;
+        return self.GetDeliveryPosition(node_index);
       })
     .define_method("num_of_singleton_nodes", &RoutingModel::GetNumOfSingletonNodes)
     .define_method("unperformed_penalty", &RoutingModel::UnperformedPenalty)
@@ -404,15 +396,15 @@ void init_routing(Rice::Module& m) {
       [](RoutingModel& self) {
         auto status = self.status();
 
-        if (status == RoutingModel::ROUTING_NOT_SOLVED) {
+        if (status == RoutingSearchStatus::ROUTING_NOT_SOLVED) {
           return Symbol("not_solved");
-        } else if (status == RoutingModel::ROUTING_SUCCESS) {
+        } else if (status == RoutingSearchStatus::ROUTING_SUCCESS) {
           return Symbol("success");
-        } else if (status == RoutingModel::ROUTING_FAIL) {
+        } else if (status == RoutingSearchStatus::ROUTING_FAIL) {
           return Symbol("fail");
-        } else if (status == RoutingModel::ROUTING_FAIL_TIMEOUT) {
+        } else if (status == RoutingSearchStatus::ROUTING_FAIL_TIMEOUT) {
           return Symbol("fail_timeout");
-        } else if (status == RoutingModel::ROUTING_INVALID) {
+        } else if (status == RoutingSearchStatus::ROUTING_INVALID) {
           return Symbol("invalid");
         } else {
           throw std::runtime_error("Unknown solver status");

data/ext/or-tools/vendor.rb

@@ -3,18 +3,18 @@ require "fileutils"
 require "net/http"
 require "tmpdir"
 
-version = "9.11.4210"
+version = "9.12.4544"
 
 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-14.6.1_cpp_v#{version}.tar.gz"
-    checksum = "a106668eb1975c1672874ef24b4f8e2e56669467a63349e5ea8ef5419814c31b"
+    filename = "or-tools_arm64_macOS-15.3.1_cpp_v#{version}.tar.gz"
+    checksum = "02f89e54bd8d86e6e069f843aeed10a444ff329052e5a7fd732c5e4ec4f845fb"
   else
-    filename = "or-tools_x86_64_macOS-14.6.1_cpp_v#{version}.tar.gz"
-    checksum = "cc87a7f8c68ec4fed6c6de6565b0b625f2f0047185a8a4449ef4b5a305b60e55"
+    filename = "or-tools_x86_64_macOS-15.3.1_cpp_v#{version}.tar.gz"
+    checksum = "515af60e73e7fa620bab7f4a7d60b9069075d814453d91906aa39993d714f28d"
   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 = "71761d93171b111fca736647a6cd00cb9e606474df597a8b48f3f5f2c73d4c0f"
+    checksum = "71128e095024707bf9835faf4558cbe34acb79345e899bd532f3008a493a8970"
   elsif os == "ubuntu" && os_version == "22.04" && !arm
     filename = "or-tools_amd64_ubuntu-22.04_cpp_v#{version}.tar.gz"
-    checksum = "f613574d4eae01afd966c8bde199990cbd9fad46035e675d71f17f5c7477eed4"
+    checksum = "cb42ea7d7799a01fea7cdaafacbdfc67180d85f39532c6d2a8c4cfb419bd07ed"
   elsif os == "ubuntu" && os_version == "20.04" && !arm
     filename = "or-tools_amd64_ubuntu-20.04_cpp_v#{version}.tar.gz"
-    checksum = "190b85f4510cab55fcb50b9850a0e2f94b2bdf5e266580650efbc5aaab760683"
+    checksum = "ea51589fe80bd9cd4fb6203bd1e956b311cdb1d21bbd14f7b6dad75c81d3583c"
   elsif os == "debian" && os_version == "11" && !arm
     filename = "or-tools_amd64_debian-11_cpp_v#{version}.tar.gz"
-    checksum = "a8354696f365aa13a2375da5f8f6cfd8785430681addcd887bfd194851dd4710"
+    checksum = "dcee63b726569bd99c134e0e920173f955feae5856c3370a0bed03fdc995af50"
   elsif os == "debian" && os_version == "12" && !arm
     filename = "or-tools_amd64_debian-12_cpp_v#{version}.tar.gz"
-    checksum = "9fda332f2f9d3b5647d85dd65de145ea3e2a1543714bf588f82da8ec57721cbf"
+    checksum = "911143f50fe013fbd50d0dce460512106596adfc0f2ad9a2bc8afd218531bde4"
   elsif os == "arch" && !arm
     filename = "or-tools_amd64_archlinux_cpp_v#{version}.tar.gz"
-    checksum = "ac892a949d871294b7e26b0730440ab8629b4021bf3c1641bc7c8fb09b45081f"
+    checksum = "18c1d929e2144e9d9602659ea2fa790bd2a150f72c32c38a97f571839816d132"
   else
     platform =
       if Gem.win_platform?
@@ -132,22 +132,17 @@ Dir.mktmpdir do |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.cp(File.join(extract_path, file), File.join(path, file))
+    FileUtils.mv(File.join(extract_path, file), File.join(path, file))
   end
 
   # include
-  FileUtils.cp_r(File.join(extract_path, "include"), File.join(path, "include"))
+  FileUtils.mv(File.join(extract_path, "include"), File.join(path, "include"))
 
   # shared library
   FileUtils.mkdir(File.join(path, "lib"))
-  Dir.glob("lib/libortools.{9.dylib,so.9}", base: extract_path) do |file|
-    so_path = File.join(path, file)
-    FileUtils.cp(File.join(extract_path, file), so_path)
-    ext = file.end_with?(".dylib") ? "dylib" : "so"
-    File.symlink(so_path, File.join(path, "lib/libortools.#{ext}"))
-  end
-  ["lib/libprotobuf.a"].each do |file|
-    FileUtils.cp(File.join(extract_path, file), File.join(path, file))
+  Dir.glob("lib/lib*{.dylib,.so,.so.*}", base: extract_path) do |file|
+    next if file.include?("libprotoc.")
+    FileUtils.mv(File.join(extract_path, file), File.join(path, file))
   end
 end
 

data/lib/or_tools/routing_model.rb

@@ -13,9 +13,5 @@ module ORTools
       search_parameters.log_search = log_search unless log_search.nil?
       solve_with_parameters(search_parameters)
     end
-
-    # previous names
-    alias_method :pickup_index_pairs, :pickup_positions
-    alias_method :delivery_index_pairs, :delivery_positions
   end
 end

data/lib/or_tools/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Andrew Kane
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-04 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -16,15 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.3
+        version: '4.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.3
-description:
+        version: '4.5'
 email: andrew@ankane.org
 executables: []
 extensions:
@@ -74,7 +72,6 @@ homepage: https://github.com/ankane/or-tools-ruby
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -89,8 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Operations research tools for Ruby
 test_files: []