or-tools 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3cfb5b8fd7f6a4563b2d50a2357e4bfc72fc5ef69e2c7c1a6ad7e7736a66235
-  data.tar.gz: a1e2307c4a94495f9fe28e85e68171a9a3474a45ed98344250920360adffbd0f
+  metadata.gz: 0b7f1f552804f88337c4d277ac7062a984c13ea67e43a8cd5567e8c0b8f1b3c6
+  data.tar.gz: 5bd93184a59799ef541745a8f4498f4cf25c525c290c3c2c7fbe2d5e5494c942
 SHA512:
-  metadata.gz: 8b62fd4b68b1a3b119d8da2987d263ad2fb0c4ca4d1062ef274f3dea440db62414af6188b769180a740a22898d26657569e71fefd0af9e754442061bcf481a1a
-  data.tar.gz: c4fbe636cd22654c867f25c954d1652540b54239a9427a7795033027a60ca7538b864e74c0134296040f57bf945750dbc80384965e7d449f9a5fb1474163ce9d
+  metadata.gz: 91077d2961b42021ee98f580d132f99a84128354bd054053de600510c4aba7343e1da9696a5d08a7c214742b92cac45200f85aa136d3e092d77b25ceb4033cdc
+  data.tar.gz: 316c4c0423522a2bdb78e006d38c412aa94cbaa14b4a37ebd3c04f340752d5f2adc5a3a9f5cf4adbd6968627a8e0504b58ae77d1d0876eb46cab783843957ead

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.8.0 (2022-08-21)
+
+- Updated OR-Tools to 9.4
+- Added binary installation for Mac ARM
+- Restored support for Debian 10
+- Dropped support for Ruby < 2.7
+
+## 0.7.3 (2022-07-23)
+
+- Added more methods to `RoutingModel` and  `RoutingDimension`
+
+## 0.7.2 (2022-05-28)
+
+- Fixed library not loaded error on Mac
+
 ## 0.7.1 (2022-05-27)
 
 - Added support for time limit for `Solver`

data/README.md

@@ -12,7 +12,7 @@ Add this line to your application’s Gemfile:
 gem "or-tools"
 ```
 
-Installation can take a few minutes as OR-Tools downloads and builds. For Mac ARM, also follow [these instructions](#additional-instructions).
+Installation can take a few minutes as OR-Tools downloads and builds.
 
 ## Guides
 
@@ -2263,17 +2263,6 @@ possible_tables.each do |table|
 end
 ```
 
-## Additional Instructions
-
-### Mac ARM
-
-ARM binaries are not available for Mac yet, so use Homebrew to install OR-Tools before installing the gem.
-
-```sh
-brew install or-tools
-bundle config build.or-tools --with-or-tools-dir=/opt/homebrew
-```
-
 ## History
 
 View the [changelog](https://github.com/ankane/or-tools-ruby/blob/master/CHANGELOG.md)

data/ext/or-tools/ext.cpp

@@ -18,13 +18,7 @@ void Init_ext()
 {
   auto m = Rice::define_module("ORTools");
 
-  // TODO use operations_research::OrToolsVersionString() in 0.8.0
-  m.define_singleton_function(
-    "lib_version",
-    []() {
-      return std::to_string(operations_research::OrToolsMajorVersion()) + "."
-        + std::to_string(operations_research::OrToolsMinorVersion());
-    });
+  m.define_singleton_function("lib_version", &operations_research::OrToolsVersionString);
 
   init_assignment(m);
   init_bin_packing(m);

data/ext/or-tools/extconf.rb

@@ -23,8 +23,9 @@ else
   rpath = "'#{rpath_prefix}/../../tmp/or-tools/lib'"
 end
 
+# find_header and find_library first check without adding path
+# which can cause them to find system library
 $INCFLAGS << " -I#{inc}"
-
 $LDFLAGS.prepend("-Wl,-rpath,#{rpath} -L#{lib} ")
 raise "OR-Tools not found" unless have_library("ortools")
 

data/ext/or-tools/routing.cpp

@@ -9,6 +9,7 @@ using operations_research::DefaultRoutingSearchParameters;
 using operations_research::FirstSolutionStrategy;
 using operations_research::LocalSearchMetaheuristic;
 using operations_research::RoutingDimension;
+using operations_research::RoutingDisjunctionIndex;
 using operations_research::RoutingIndexManager;
 using operations_research::RoutingModel;
 using operations_research::RoutingModelParameters;
@@ -55,6 +56,19 @@ namespace Rice::detail
   };
 }
 
+namespace Rice::detail
+{
+  template<class T, class U>
+  class To_Ruby<std::pair<T, U>>
+  {
+  public:
+    VALUE convert(std::pair<T, U> const & x)
+    {
+      return rb_ary_new3(2, To_Ruby<T>().convert(x.first), To_Ruby<U>().convert(x.second));
+    }
+  };
+}
+
 void init_routing(Rice::Module& m) {
   auto rb_cRoutingSearchParameters = Rice::define_class_under<RoutingSearchParameters>(m, "RoutingSearchParameters");
   auto rb_cIntVar = Rice::define_class_under<operations_research::IntVar>(m, "IntVar");
@@ -198,8 +212,28 @@ void init_routing(Rice::Module& m) {
     .define_method("old_end_max", &operations_research::IntervalVar::OldEndMax);
 
   Rice::define_class_under<RoutingDimension>(m, "RoutingDimension")
+    .define_method("transit_value", &RoutingDimension::GetTransitValue)
+    // TODO GetTransitValueFromClass
+    .define_method("cumul_var", &RoutingDimension::CumulVar)
+    .define_method("transit_var", &RoutingDimension::TransitVar)
+    .define_method("fixed_transit_var", &RoutingDimension::FixedTransitVar)
+    .define_method("slack_var", &RoutingDimension::SlackVar)
+    .define_method("set_span_upper_bound_for_vehicle", &RoutingDimension::SetSpanUpperBoundForVehicle)
+    .define_method("set_span_cost_coefficient_for_vehicle", &RoutingDimension::SetSpanCostCoefficientForVehicle)
+    .define_method("set_span_cost_coefficient_for_all_vehicles", &RoutingDimension::SetSpanCostCoefficientForAllVehicles)
+    .define_method("set_global_span_cost_coefficient", &RoutingDimension::SetGlobalSpanCostCoefficient)
+    // alias
     .define_method("global_span_cost_coefficient=", &RoutingDimension::SetGlobalSpanCostCoefficient)
-    .define_method("cumul_var", &RoutingDimension::CumulVar);
+    .define_method("set_cumul_var_soft_upper_bound", &RoutingDimension::SetCumulVarSoftUpperBound)
+    .define_method("cumul_var_soft_upper_bound?", &RoutingDimension::HasCumulVarSoftUpperBound)
+    .define_method("cumul_var_soft_upper_bound", &RoutingDimension::GetCumulVarSoftUpperBound)
+    .define_method("cumul_var_soft_upper_bound_coefficient", &RoutingDimension::GetCumulVarSoftUpperBoundCoefficient)
+    .define_method("set_cumul_var_soft_lower_bound", &RoutingDimension::SetCumulVarSoftLowerBound)
+    .define_method("cumul_var_soft_lower_bound?", &RoutingDimension::HasCumulVarSoftLowerBound)
+    .define_method("cumul_var_soft_lower_bound", &RoutingDimension::GetCumulVarSoftLowerBound)
+    .define_method("cumul_var_soft_lower_bound_coefficient", &RoutingDimension::GetCumulVarSoftLowerBoundCoefficient);
+
+  Rice::define_class_under<RoutingDisjunctionIndex>(m, "RoutingDisjunctionIndex");
 
   Rice::define_class_under<operations_research::Constraint>(m, "Constraint")
     .define_method("post", &operations_research::Constraint::Post)
@@ -264,27 +298,99 @@ void init_routing(Rice::Module& m) {
 
   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_method("register_unary_transit_vector", &RoutingModel::RegisterUnaryTransitVector)
     .define_method(
-      "register_transit_callback",
+      "register_unary_transit_callback",
       [](RoutingModel& self, Object callback) {
-        return self.RegisterTransitCallback(
-          [callback](int64_t from_index, int64_t to_index) -> int64_t {
-            return Rice::detail::From_Ruby<int64_t>().convert(callback.call("call", from_index, to_index));
+        return self.RegisterUnaryTransitCallback(
+          [callback](int64_t from_index) -> int64_t {
+            return Rice::detail::From_Ruby<int64_t>().convert(callback.call("call", from_index));
           }
         );
       })
+    .define_method("register_transit_matrix", &RoutingModel::RegisterTransitMatrix)
     .define_method(
-      "register_unary_transit_callback",
+      "register_transit_callback",
       [](RoutingModel& self, Object callback) {
-        return self.RegisterUnaryTransitCallback(
-          [callback](int64_t from_index) -> int64_t {
-            return Rice::detail::From_Ruby<int64_t>().convert(callback.call("call", from_index));
+        return self.RegisterTransitCallback(
+          [callback](int64_t from_index, int64_t to_index) -> int64_t {
+            return Rice::detail::From_Ruby<int64_t>().convert(callback.call("call", from_index, to_index));
           }
         );
       })
+    .define_method("add_dimension", &RoutingModel::AddDimension)
+    .define_method("add_dimension_with_vehicle_transits", &RoutingModel::AddDimensionWithVehicleTransits)
+    .define_method("add_dimension_with_vehicle_capacity", &RoutingModel::AddDimensionWithVehicleCapacity)
+    .define_method("add_dimension_with_vehicle_transit_and_capacity", &RoutingModel::AddDimensionWithVehicleTransitAndCapacity)
+    .define_method("add_constant_dimension_with_slack", &RoutingModel::AddConstantDimensionWithSlack)
+    .define_method("add_constant_dimension", &RoutingModel::AddConstantDimension)
+    .define_method("add_vector_dimension", &RoutingModel::AddVectorDimension)
+    .define_method("add_matrix_dimension", &RoutingModel::AddMatrixDimension)
+    // TODO AddDimensionDependentDimensionWithVehicleCapacity
+    // .define_method("make_path_spans_and_total_slacks", &RoutingModel::MakePathSpansAndTotalSlacks)
+    .define_method("all_dimension_names", &RoutingModel::GetAllDimensionNames)
+    // .define_method("dimensions", &RoutingModel::GetDimensions)
+    // .define_method("dimensions_with_soft_or_span_costs", &RoutingModel::GetDimensionsWithSoftOrSpanCosts)
+    .define_method("dimension?", &RoutingModel::HasDimension)
+    // .define_method("dimension_or_die", &RoutingModel::GetDimensionOrDie)
+    .define_method("mutable_dimension", &RoutingModel::GetMutableDimension)
+    .define_method("set_primary_constrained_dimension", &RoutingModel::SetPrimaryConstrainedDimension)
+    .define_method("primary_constrained_dimension", &RoutingModel::GetPrimaryConstrainedDimension)
+    .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("disjunction_indices", &RoutingModel::GetDisjunctionIndices)
+    .define_method("disjunction_penalty", &RoutingModel::GetDisjunctionPenalty)
+    .define_method("disjunction_max_cardinality", &RoutingModel::GetDisjunctionMaxCardinality)
+    .define_method("number_of_disjunctions", &RoutingModel::GetNumberOfDisjunctions)
+    .define_method("mandatory_disjunctions?", &RoutingModel::HasMandatoryDisjunctions)
+    .define_method("max_cardinality_constrained_disjunctions?", &RoutingModel::HasMaxCardinalityConstrainedDisjunctions)
+    .define_method("perfect_binary_disjunctions", &RoutingModel::GetPerfectBinaryDisjunctions)
+    .define_method("ignore_disjunctions_already_forced_to_zero", &RoutingModel::IgnoreDisjunctionsAlreadyForcedToZero)
+    .define_method("add_soft_same_vehicle_constraint", &RoutingModel::AddSoftSameVehicleConstraint)
+    .define_method("set_allowed_vehicles_for_index", &RoutingModel::SetAllowedVehiclesForIndex)
+    .define_method("vehicle_allowed_for_index?", &RoutingModel::IsVehicleAllowedForIndex)
+    .define_method("add_pickup_and_delivery", &RoutingModel::AddPickupAndDelivery)
+    .define_method("add_pickup_and_delivery_sets", &RoutingModel::AddPickupAndDeliverySets)
+    .define_method("pickup_index_pairs", &RoutingModel::GetPickupIndexPairs)
+    .define_method("delivery_index_pairs", &RoutingModel::GetDeliveryIndexPairs)
+    // TODO SetPickupAndDeliveryPolicyOfAllVehicles
+    // TODO SetPickupAndDeliveryPolicyOfVehicle
+    // TODO GetPickupAndDeliveryPolicyOfVehicle
+    .define_method("num_of_singleton_nodes", &RoutingModel::GetNumOfSingletonNodes)
+    .define_method("unperformed_penalty", &RoutingModel::UnperformedPenalty)
+    .define_method("unperformed_penalty_or_value", &RoutingModel::UnperformedPenaltyOrValue)
     .define_method("depot", &RoutingModel::GetDepot)
-    .define_method("size", &RoutingModel::Size)
-    .define_method("status", [](RoutingModel& self) {
+    .define_method("set_maximum_number_of_active_vehicles", &RoutingModel::SetMaximumNumberOfActiveVehicles)
+    .define_method("maximum_number_of_active_vehicles", &RoutingModel::GetMaximumNumberOfActiveVehicles)
+    .define_method("set_arc_cost_evaluator_of_all_vehicles", &RoutingModel::SetArcCostEvaluatorOfAllVehicles)
+    .define_method("set_arc_cost_evaluator_of_vehicle", &RoutingModel::SetArcCostEvaluatorOfVehicle)
+    .define_method("set_fixed_cost_of_all_vehicles", &RoutingModel::SetFixedCostOfAllVehicles)
+    .define_method("set_fixed_cost_of_vehicle", &RoutingModel::SetFixedCostOfVehicle)
+    .define_method("fixed_cost_of_vehicle", &RoutingModel::GetFixedCostOfVehicle)
+    .define_method("set_amortized_cost_factors_of_all_vehicles", &RoutingModel::SetAmortizedCostFactorsOfAllVehicles)
+    .define_method("set_amortized_cost_factors_of_vehicle", &RoutingModel::SetAmortizedCostFactorsOfVehicle)
+    .define_method("amortized_linear_cost_factor_of_vehicles", &RoutingModel::GetAmortizedLinearCostFactorOfVehicles)
+    .define_method("amortized_quadratic_cost_factor_of_vehicles", &RoutingModel::GetAmortizedQuadraticCostFactorOfVehicles)
+    .define_method("set_vehicle_used_when_empty", &RoutingModel::SetVehicleUsedWhenEmpty)
+    .define_method("vehicle_used_when_empty?", &RoutingModel::IsVehicleUsedWhenEmpty)
+    .define_method("add_variable_minimized_by_finalizer", &RoutingModel::AddVariableMinimizedByFinalizer)
+    .define_method("add_variable_maximized_by_finalizer", &RoutingModel::AddVariableMaximizedByFinalizer)
+    .define_method("add_weighted_variable_minimized_by_finalizer", &RoutingModel::AddWeightedVariableMinimizedByFinalizer)
+    .define_method("add_weighted_variable_maximized_by_finalizer", &RoutingModel::AddWeightedVariableMaximizedByFinalizer)
+    .define_method("add_variable_target_to_finalizer", &RoutingModel::AddVariableTargetToFinalizer)
+    .define_method("add_weighted_variable_target_to_finalizer", &RoutingModel::AddWeightedVariableTargetToFinalizer)
+    .define_method("close_model", &RoutingModel::CloseModel)
+    // solve defined in Ruby
+    .define_method(
+      "solve_with_parameters",
+      [](RoutingModel& self, const RoutingSearchParameters& search_parameters) {
+        return self.SolveWithParameters(search_parameters);
+      })
+    .define_method("compute_lower_bound", &RoutingModel::ComputeLowerBound)
+    .define_method("status",
+      [](RoutingModel& self) {
         auto status = self.status();
 
         if (status == RoutingModel::ROUTING_NOT_SOLVED) {
@@ -301,30 +407,22 @@ void init_routing(Rice::Module& m) {
           throw std::runtime_error("Unknown solver status");
         }
       })
-    .define_method("vehicle_var", &RoutingModel::VehicleVar)
-    .define_method("set_arc_cost_evaluator_of_all_vehicles", &RoutingModel::SetArcCostEvaluatorOfAllVehicles)
-    .define_method("set_arc_cost_evaluator_of_vehicle", &RoutingModel::SetArcCostEvaluatorOfVehicle)
-    .define_method("set_fixed_cost_of_all_vehicles", &RoutingModel::SetFixedCostOfAllVehicles)
-    .define_method("set_fixed_cost_of_vehicle", &RoutingModel::SetFixedCostOfVehicle)
-    .define_method("fixed_cost_of_vehicle", &RoutingModel::GetFixedCostOfVehicle)
-    .define_method("add_dimension", &RoutingModel::AddDimension)
-    .define_method(
-      "add_dimension_with_vehicle_capacity",
-      [](RoutingModel& self, int evaluator_index, int64_t slack_max, std::vector<int64_t> vehicle_capacities, bool fix_start_cumul_to_zero, const std::string& name) {
-        self.AddDimensionWithVehicleCapacity(evaluator_index, slack_max, vehicle_capacities, fix_start_cumul_to_zero, name);
-      })
-    .define_method(
-      "add_dimension_with_vehicle_transits",
-      [](RoutingModel& self, std::vector<int> evaluator_indices, int64_t slack_max, int64_t capacity, bool fix_start_cumul_to_zero, const std::string& name) {
-        self.AddDimensionWithVehicleTransits(evaluator_indices, slack_max, capacity, fix_start_cumul_to_zero, name);
-      })
-    .define_method(
-      "add_disjunction",
-      [](RoutingModel& self, std::vector<int64_t> indices, int64_t penalty) {
-        self.AddDisjunction(indices, penalty);
-      })
-    .define_method("add_pickup_and_delivery", &RoutingModel::AddPickupAndDelivery)
-    .define_method("solver", &RoutingModel::solver)
+    .define_method("apply_locks", &RoutingModel::ApplyLocks)
+    .define_method("apply_locks_to_all_vehicles", &RoutingModel::ApplyLocksToAllVehicles)
+    .define_method("pre_assignment", &RoutingModel::PreAssignment)
+    .define_method("mutable_pre_assignment", &RoutingModel::MutablePreAssignment)
+    .define_method("write_assignment", &RoutingModel::WriteAssignment)
+    .define_method("read_assignment", &RoutingModel::ReadAssignment)
+    .define_method("restore_assignment", &RoutingModel::RestoreAssignment)
+    .define_method("read_assignment_from_routes", &RoutingModel::ReadAssignmentFromRoutes)
+    .define_method("routes_to_assignment", &RoutingModel::RoutesToAssignment)
+    .define_method("assignment_to_routes", &RoutingModel::AssignmentToRoutes)
+    .define_method("compact_assignment", &RoutingModel::CompactAssignment)
+    .define_method("compact_and_check_assignment", &RoutingModel::CompactAndCheckAssignment)
+    .define_method("add_to_assignment", &RoutingModel::AddToAssignment)
+    .define_method("add_interval_to_assignment", &RoutingModel::AddIntervalToAssignment)
+    // TODO PackCumulsOfOptimizerDimensionsFromAssignment
+    // TODO AddLocalSearchFilter
     .define_method("start", &RoutingModel::Start)
     .define_method("end", &RoutingModel::End)
     .define_method("start?", &RoutingModel::IsStart)
@@ -333,12 +431,23 @@ void init_routing(Rice::Module& m) {
     .define_method("next", &RoutingModel::Next)
     .define_method("vehicle_used?", &RoutingModel::IsVehicleUsed)
     .define_method("next_var", &RoutingModel::NextVar)
+    .define_method("active_var", &RoutingModel::ActiveVar)
+    .define_method("active_vehicle_var", &RoutingModel::ActiveVehicleVar)
+    .define_method("vehicle_route_considered_var", &RoutingModel::VehicleRouteConsideredVar)
+    .define_method("vehicle_var", &RoutingModel::VehicleVar)
+    .define_method("resource_var", &RoutingModel::ResourceVar)
+    .define_method("cost_var", &RoutingModel::CostVar)
     .define_method("arc_cost_for_vehicle", &RoutingModel::GetArcCostForVehicle)
-    .define_method("mutable_dimension", &RoutingModel::GetMutableDimension)
-    .define_method("add_variable_minimized_by_finalizer", &RoutingModel::AddVariableMinimizedByFinalizer)
-    .define_method(
-      "solve_with_parameters",
-      [](RoutingModel& self, const RoutingSearchParameters& search_parameters) {
-        return self.SolveWithParameters(search_parameters);
-      });
+    .define_method("costs_are_homogeneous_across_vehicles?", &RoutingModel::CostsAreHomogeneousAcrossVehicles)
+    .define_method("homogeneous_cost", &RoutingModel::GetHomogeneousCost)
+    .define_method("arc_cost_for_first_solution", &RoutingModel::GetArcCostForFirstSolution)
+    .define_method("cost_classes_count", &RoutingModel::GetCostClassesCount)
+    .define_method("non_zero_cost_classes_count", &RoutingModel::GetNonZeroCostClassesCount)
+    .define_method("vehicle_classes_count", &RoutingModel::GetVehicleClassesCount)
+    .define_method("arc_is_more_constrained_than_arc?", &RoutingModel::ArcIsMoreConstrainedThanArc)
+    .define_method("solver", &RoutingModel::solver)
+    .define_method("nodes", &RoutingModel::nodes)
+    .define_method("vehicles", &RoutingModel::vehicles)
+    .define_method("size", &RoutingModel::Size)
+    .define_method("matching_model?", &RoutingModel::IsMatchingModel);
 }

data/ext/or-tools/vendor.rb

@@ -4,21 +4,15 @@ require "fileutils"
 require "net/http"
 require "tmpdir"
 
-version = "9.3.10497"
+version = "9.4.1874"
 
 if RbConfig::CONFIG["host_os"] =~ /darwin/i
   if RbConfig::CONFIG["host_cpu"] =~ /arm|aarch64/i
-    raise <<~MSG
-      Binary installation not available for this platform: Mac ARM
-
-      Run:
-      brew install or-tools
-      bundle config build.or-tools --with-or-tools-dir=/opt/homebrew
-
-    MSG
+    filename = "or-tools_arm64_MacOsX-12.5_cpp_v#{version}.tar.gz"
+    checksum = "ebc185bcb0a056a2704fb1c5175d5c11cc21a7e0634be65139cea55bb6a021ce"
   else
-    filename = "or-tools_MacOsX-12.2.1_v#{version}.tar.gz"
-    checksum = "33941702c59983897935eef06d91aca6c89ed9a8f5f4de3a9dfe489e97d7ca8c"
+    filename = "or-tools_x86_64_MacOsX-12.5_cpp_v#{version}.tar.gz"
+    checksum = "d03c706b51a6ef7aa77886dc3f135baaac52c00803bb548c286fbdeb4a419acd"
   end
 else
   # try /etc/os-release with fallback to /usr/lib/os-release
@@ -32,21 +26,23 @@ else
   os_version = os_info["VERSION_ID"]
 
   if os == "ubuntu" && os_version == "20.04"
-    # TODO remove sub in v9.4
-    filename = "or-tools_amd64_ubuntu-20.04_v#{version.sub(".10497", ".10502")}.tar.gz"
-    checksum = "3d1979967a2c9358b5bc956f2e6b608b00e89e13c71d48d075475ce4138b6d1c"
+    filename = "or-tools_amd64_ubuntu-20.04_cpp_v#{version}.tar.gz"
+    checksum = "1b09f0f60b5aab83aeec468842e4a166cd3a4e7910e807f55bc7f96d5dffabdb"
   elsif os == "ubuntu" && os_version == "18.04"
-    filename = "or-tools_amd64_ubuntu-18.04_v#{version}.tar.gz"
-    checksum = "6ba5cc153417267e8f8e15f8b6390b17f22de07bacc61f3740a4172ccd56c274"
+    filename = "or-tools_amd64_ubuntu-18.04_cpp_v#{version}.tar.gz"
+    checksum = "ef73ebd4ca0f82a1179fdb2aded3c2a85dfe2ab275d91b8a5b147a653ca861ab"
   elsif os == "debian" && os_version == "11"
-    filename = "or-tools_amd64_debian-11_v#{version}.tar.gz"
-    checksum = "db0636bab909eabf06a7004f7572dca6fa152f3823c1365b0b7428405bf250e6"
+    filename = "or-tools_amd64_debian-11_cpp_v#{version}.tar.gz"
+    checksum = "651c62147f231fb90635c522e0a2c799e3de3991c2c75f7c6acb721e7b78946c"
+  elsif os == "debian" && os_version == "10"
+    filename = "or-tools_amd64_debian-10_cpp_v#{version}.tar.gz"
+    checksum = "36088bc6c6fbb96539245db7cddf498f77ae3e7b7c2cc8f6d7d89d76f90751fb"
   elsif os == "centos" && os_version == "8"
-    filename = "or-tools_amd64_centos-8_v#{version}.tar.gz"
-    checksum = "e5649069fd7a3e8228cc18b91e265a90562c5d03a0c962b0346911aada0aedc9"
+    filename = "or-tools_amd64_centos-8_cpp_v#{version}.tar.gz"
+    checksum = "da2cb303ae332d207592f21bb504e4e2e33dc1b1e8f5747d413c082d9d05504a"
   elsif os == "centos" && os_version == "7"
-    filename = "or-tools_amd64_centos-7_v#{version}.tar.gz"
-    checksum = "3bffdec8c09fc1345dcbd6a553437e2894014093fafb53e50adc7d4d776bb08b"
+    filename = "or-tools_amd64_centos-7_cpp_v#{version}.tar.gz"
+    checksum = "9eaf0178467f4d2fdbe496f62223809aa43e313548cc6cb716e661c00472b4ff"
   else
     platform =
       if Gem.win_platform?
@@ -142,12 +138,11 @@ Dir.mktmpdir do |extract_path|
 
   # shared library
   FileUtils.mkdir(File.join(path, "lib"))
-  Dir.glob("lib/libortools.{dylib,so.9}", base: extract_path) do |file|
-    FileUtils.cp(File.join(extract_path, file), File.join(path, file))
-  end
-  so_path = File.join(path, "lib/libortools.so.9")
-  if File.exist?(so_path)
-    File.symlink(so_path, File.join(path, "lib/libortools.so"))
+  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
 end
 

data/lib/or_tools/tsp.rb

@@ -22,13 +22,7 @@ module ORTools
       manager = ORTools::RoutingIndexManager.new(locations.size, 1, 0)
       routing = ORTools::RoutingModel.new(manager)
 
-      distance_callback = lambda do |from_index, to_index|
-        from_node = manager.index_to_node(from_index)
-        to_node = manager.index_to_node(to_index)
-        distance_matrix[from_node][to_node]
-      end
-
-      transit_callback_index = routing.register_transit_callback(distance_callback)
+      transit_callback_index = routing.register_transit_matrix(distance_matrix)
       routing.set_arc_cost_evaluator_of_all_vehicles(transit_callback_index)
       assignment = routing.solve(first_solution_strategy: :path_cheapest_arc)
 

data/lib/or_tools/version.rb

@@ -1,3 +1,3 @@
 module ORTools
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-28 00:00:00.000000000 Z
+date: 2022-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -85,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="