or-tools 0.5.0 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 405e26b51140e6605acd8904d7e90e0e7f48b7cfd83641fef6e2e737e7b8cda4
-  data.tar.gz: e6e0506979a829c260f8bae70e7769524d59d83b7a52e1cadfb6e553d8116587
+  metadata.gz: e88bfc983ea525a514082c15ad21c53f9e35f8b1d291d55f6810a0c47c7a2fa8
+  data.tar.gz: d3101dceed98ebd35f788c1cd5df122078cd435f5bceb21cf4e7a1b13dd2ac04
 SHA512:
-  metadata.gz: 237e13e7340682d974602743de724031c28c99add58c4cf49e670bb05f4fa0c691dcf00dd75797a9ab3efcc9b5505a96f3a2a3d542db8c8746652ec114b5a258
-  data.tar.gz: 5c782dd281122001095663da47fce8279f5a2c29b6eed65e2288df6727c55724ef424d4c3bfda3ed3b4ce53493964b88d64f67fc843e97dafd98f3e21a4c5183
+  metadata.gz: a12e68f45b7829f76d77e107c14cb072158bc956348b07dc93bc0bcb4a91f6fff8a22389d88bd8102a3c7d6eec86e25e4aeca4043cd4b2b560575f8d5dde8578
+  data.tar.gz: 1448aa409c1664ce15e859a5ad115b4ba975f4b976ad522cc95db4699c65c9356a5b78f05507db166a46fd60cc80e0907a85b625fc2150bdaa591fe3aa7b13db

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 0.5.4 (2021-10-01)
+
+- Updated OR-Tools to 9.1
+- Added binary installation for Debian 11
+- Deprecated `solve_with_solution_callback` and `search_for_all_solutions`
+
+## 0.5.3 (2021-08-02)
+
+- Added more methods to `IntVar`, `IntervalVar`, and `Constraint`
+- Added `RoutingModelParameters`
+
+## 0.5.2 (2021-07-07)
+
+- Added `export_model_as_lp_format` and `export_model_as_mps_format` to `Solver`
+
+## 0.5.1 (2021-05-23)
+
+- Updated to Rice 4
+
 ## 0.5.0 (2021-04-30)
 
 - Updated OR-Tools to 9.0

data/README.md

@@ -2139,7 +2139,7 @@ model.add(seats[[0, 0]] == 1)
 # Solve model
 solver = ORTools::CpSolver.new
 solution_printer = WeddingChartPrinter.new(seats, names, num_tables, num_guests)
-solver.solve_with_solution_callback(model, solution_printer)
+solver.solve(model, solution_printer)
 
 puts "Statistics"
 puts "  - conflicts    : %i" % solver.num_conflicts

data/ext/or-tools/assignment.cpp

@@ -1,12 +1,9 @@
 #include <ortools/graph/assignment.h>
 
-#include <rice/Array.hpp>
-#include <rice/Constructor.hpp>
-#include <rice/Module.hpp>
+#include "ext.h"
 
 using operations_research::SimpleLinearSumAssignment;
 
-using Rice::Array;
 using Rice::Symbol;
 
 void init_assignment(Rice::Module& m) {
@@ -23,7 +20,7 @@ void init_assignment(Rice::Module& m) {
     .define_method("assignment_cost", &SimpleLinearSumAssignment::AssignmentCost)
     .define_method(
       "solve",
-      *[](SimpleLinearSumAssignment& self) {
+      [](SimpleLinearSumAssignment& self) {
         auto status = self.Solve();
 
         if (status == SimpleLinearSumAssignment::Status::OPTIMAL) {

data/ext/or-tools/bin_packing.cpp

@@ -1,8 +1,6 @@
 #include <ortools/algorithms/knapsack_solver.h>
 
-#include <rice/Array.hpp>
-#include <rice/Constructor.hpp>
-#include <rice/Module.hpp>
+#include "ext.h"
 
 using operations_research::KnapsackSolver;
 
@@ -10,16 +8,31 @@ using Rice::Array;
 using Rice::Object;
 using Rice::Symbol;
 
-template<>
-inline
-KnapsackSolver::SolverType from_ruby<KnapsackSolver::SolverType>(Object x)
+namespace Rice::detail
 {
-  std::string s = Symbol(x).str();
-  if (s == "branch_and_bound") {
-    return KnapsackSolver::KNAPSACK_MULTIDIMENSION_BRANCH_AND_BOUND_SOLVER;
-  } else {
-    throw std::runtime_error("Unknown solver type: " + s);
-  }
+  template<>
+  struct Type<KnapsackSolver::SolverType>
+  {
+    static bool verify()
+    {
+      return true;
+    }
+  };
+
+  template<>
+  class From_Ruby<KnapsackSolver::SolverType>
+  {
+  public:
+    KnapsackSolver::SolverType convert(VALUE x)
+    {
+      auto s = Symbol(x).str();
+      if (s == "branch_and_bound") {
+        return KnapsackSolver::KNAPSACK_MULTIDIMENSION_BRANCH_AND_BOUND_SOLVER;
+      } else {
+        throw std::runtime_error("Unknown solver type: " + s);
+      }
+    }
+  };
 }
 
 void init_bin_packing(Rice::Module& m) {
@@ -29,27 +42,7 @@ void init_bin_packing(Rice::Module& m) {
     .define_method("best_solution_contains?", &KnapsackSolver::BestSolutionContains)
     .define_method(
       "init",
-      *[](KnapsackSolver& self, Array rb_values, Array rb_weights, Array rb_capacities) {
-        std::vector<int64_t> values;
-        for (std::size_t i = 0; i < rb_values.size(); ++i) {
-          values.push_back(from_ruby<int64_t>(rb_values[i]));
-        }
-
-        std::vector<std::vector<int64_t>> weights;
-        for (std::size_t i = 0; i < rb_weights.size(); ++i) {
-          Array rb_w = Array(rb_weights[i]);
-          std::vector<int64_t> w;
-          for (std::size_t j = 0; j < rb_w.size(); ++j) {
-            w.push_back(from_ruby<int64_t>(rb_w[j]));
-          }
-          weights.push_back(w);
-        }
-
-        std::vector<int64_t> capacities;
-        for (std::size_t i = 0; i < rb_capacities.size(); ++i) {
-          capacities.push_back(from_ruby<int64_t>(rb_capacities[i]));
-        }
-
+       [](KnapsackSolver& self, std::vector<int64_t> values, std::vector<std::vector<int64_t>> weights, std::vector<int64_t> capacities) {
         self.Init(values, weights, capacities);
       });
 }