or-tools 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c17039d61f01ad9e167b5e8d1b39995a1f8a1cffa20d4c3e26485e2f0cf6b19
-  data.tar.gz: e8e016ac25dda825bfb0115b5604dcffae4933514532a1c24659c9afe5bc5d59
+  metadata.gz: 8c04ebe4cc7e1ab63d7cd996f683afe5966d3069b2915d87d68a69f3767a9bea
+  data.tar.gz: 44975b51bc4433d3b2d35ea8aa55a5860f77aa21503f2983bb4d83de225e1774
 SHA512:
-  metadata.gz: 7ebd2e2454cab59523831c3d2cd073d1ab4c052c3009157784058dae07c513860658371a82edcaf77aaaf7a75a8b0153db412b2d227ce1158bdf5d9d025bacd8
-  data.tar.gz: d556fbc1778bc761824a3f218d5eccfae6e609ad00e80abe32a547e1ea6be39ac0dc0f5dade5f89b4a7315dc3af9a1c16524bb58e988962bc752fe5aba31c3b8
+  metadata.gz: e5667583ce71e21fb774d499ed8b9efb12dc13776f39632595517b1d60c1c5c3f6d1d2c58f712f2e1356fb69af81a91ba8507fcb3b001df67ea2e0eb04cfa562
+  data.tar.gz: 0db18ffcb4b67f75067fb1b805f0160ba72fdd18d1894f47a29e6a76a969c0463d7d7e787b0a8d77891cd517eb5b9bdf4780ee771a876fde6ca53a8561084f7c

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.9.0 (2022-12-02)
+
+- Updated OR-Tools to 9.5
+- Added `solve_from_assignment_with_parameters` to `RoutingModel`
+- Improved `inspect` and `to_s` for expressions
+
+## 0.8.2 (2022-11-05)
+
+- Added support for bool vars to `add_hint`
+- Added support for empty sums to `CpModel`
+
 ## 0.8.1 (2022-08-22)
 
 - Added binary installation for Ubuntu 22.04
@@ -11,7 +22,7 @@
 
 ## 0.7.3 (2022-07-23)
 
-- Added more methods to `RoutingModel` and  `RoutingDimension`
+- Added more methods to `RoutingModel` and `RoutingDimension`
 
 ## 0.7.2 (2022-05-28)
 

data/README.md

@@ -14,7 +14,7 @@ gem "or-tools"
 
 Installation can take a few minutes as OR-Tools downloads and builds.
 
-## Guides
+## Getting Started
 
 Higher Level Interfaces
 

data/ext/or-tools/constraint.cpp

@@ -298,8 +298,18 @@ void init_constraint(Rice::Module& m) {
       })
     .define_method(
       "add_hint",
-      [](CpModelBuilder& self, IntVar var, int64_t value) {
-        self.AddHint(var, value);
+      [](CpModelBuilder& self, Object var, Object value) {
+        if (var.is_a(rb_cBoolVar)) {
+          self.AddHint(
+            Rice::detail::From_Ruby<BoolVar>().convert(var.value()),
+            Rice::detail::From_Ruby<bool>().convert(value.value())
+          );
+        } else {
+          self.AddHint(
+            Rice::detail::From_Ruby<IntVar>().convert(var.value()),
+            Rice::detail::From_Ruby<int64_t>().convert(value.value())
+          );
+        }
       })
     .define_method(
       "clear_hints",

data/ext/or-tools/linear.cpp

@@ -47,7 +47,6 @@ namespace Rice::detail
 void init_linear(Rice::Module& m) {
   Rice::define_class_under<LinearRange>(m, "LinearRange");
 
-  // TODO remove in 0.8.0
   auto rb_cLinearExpr = Rice::define_class_under<LinearExpr>(m, "LinearExpr");
   rb_cLinearExpr.define_constructor(Rice::Constructor<LinearExpr>());
 

data/ext/or-tools/routing.cpp

@@ -388,6 +388,11 @@ void init_routing(Rice::Module& m) {
       [](RoutingModel& self, const RoutingSearchParameters& search_parameters) {
         return self.SolveWithParameters(search_parameters);
       })
+    .define_method(
+      "solve_from_assignment_with_parameters",
+      [](RoutingModel& self, const Assignment* assignment, const RoutingSearchParameters& search_parameters) {
+        return self.SolveFromAssignmentWithParameters(assignment, search_parameters);
+      })
     .define_method("compute_lower_bound", &RoutingModel::ComputeLowerBound)
     .define_method("status",
       [](RoutingModel& self) {

data/ext/or-tools/vendor.rb

@@ -4,15 +4,15 @@ require "fileutils"
 require "net/http"
 require "tmpdir"
 
-version = "9.4.1874"
+version = "9.5.2237"
 
 if RbConfig::CONFIG["host_os"] =~ /darwin/i
   if RbConfig::CONFIG["host_cpu"] =~ /arm|aarch64/i
-    filename = "or-tools_arm64_MacOsX-12.5_cpp_v#{version}.tar.gz"
-    checksum = "ebc185bcb0a056a2704fb1c5175d5c11cc21a7e0634be65139cea55bb6a021ce"
+    filename = "or-tools_arm64_macOS-13.0.1_cpp_v#{version}.tar.gz"
+    checksum = "9041ccb29618bce793c68eaa30a01b1fbaa6491656bddd942753d9a412544db7"
   else
-    filename = "or-tools_x86_64_MacOsX-12.5_cpp_v#{version}.tar.gz"
-    checksum = "d03c706b51a6ef7aa77886dc3f135baaac52c00803bb548c286fbdeb4a419acd"
+    filename = "or-tools_x86_64_macOS-13.0.1_cpp_v#{version}.tar.gz"
+    checksum = "f4af2bfd3b19cff6056e01abcddf1f5a54a0da891cafd73a25a671a3abd17c76"
   end
 else
   # try /etc/os-release with fallback to /usr/lib/os-release
@@ -27,25 +27,25 @@ else
 
   if os == "ubuntu" && os_version == "22.04"
     filename = "or-tools_amd64_ubuntu-22.04_cpp_v#{version}.tar.gz"
-    checksum = "d7e222fc4f30c9864bfa3062accc8b4dd291c3166ba9cf3576c6c86eded71940"
+    checksum = "acecd79867f4bd5f6b91d95743fc858e939d8611e534914a540ee4f46c535247"
   elsif os == "ubuntu" && os_version == "20.04"
     filename = "or-tools_amd64_ubuntu-20.04_cpp_v#{version}.tar.gz"
-    checksum = "1b09f0f60b5aab83aeec468842e4a166cd3a4e7910e807f55bc7f96d5dffabdb"
+    checksum = "506b420e1b1232440e49680e55ae087000f2c92b1009e46417c774d8332f217b"
   elsif os == "ubuntu" && os_version == "18.04"
     filename = "or-tools_amd64_ubuntu-18.04_cpp_v#{version}.tar.gz"
-    checksum = "ef73ebd4ca0f82a1179fdb2aded3c2a85dfe2ab275d91b8a5b147a653ca861ab"
+    checksum = "96ee5b4f3cf6dfece6dc54a78c6aa4a55dae5bd7d4f4176b332d3f3aa6cd973f"
   elsif os == "debian" && os_version == "11"
     filename = "or-tools_amd64_debian-11_cpp_v#{version}.tar.gz"
-    checksum = "651c62147f231fb90635c522e0a2c799e3de3991c2c75f7c6acb721e7b78946c"
+    checksum = "00bef600d0e2452544484f26f49bada4f717d7735f9d65c3961def8ab83876d3"
   elsif os == "debian" && os_version == "10"
     filename = "or-tools_amd64_debian-10_cpp_v#{version}.tar.gz"
-    checksum = "36088bc6c6fbb96539245db7cddf498f77ae3e7b7c2cc8f6d7d89d76f90751fb"
+    checksum = "a45c566dbfe818386bc1aa061a167650c691f447b2937cdc8bdb1e9054ba4715"
   elsif os == "centos" && os_version == "8"
     filename = "or-tools_amd64_centos-8_cpp_v#{version}.tar.gz"
-    checksum = "da2cb303ae332d207592f21bb504e4e2e33dc1b1e8f5747d413c082d9d05504a"
+    checksum = "af82328d06c402917735482045e7abc37a6f9258db3d607d6efc62c27f765334"
   elsif os == "centos" && os_version == "7"
     filename = "or-tools_amd64_centos-7_cpp_v#{version}.tar.gz"
-    checksum = "9eaf0178467f4d2fdbe496f62223809aa43e313548cc6cb716e661c00472b4ff"
+    checksum = "3d28bdd3ab27224b80960393c7f51e7c228ae78297c28e4ae79bc6c269ae44fe"
   else
     platform =
       if Gem.win_platform?

data/lib/or_tools/comparison.rb

@@ -9,12 +9,11 @@ module ORTools
     end
 
     def to_s
-      "#{left.inspect} #{operator} #{right.inspect}"
+      "#{left} #{operator} #{right}"
     end
 
-    # TODO add class
     def inspect
-      to_s
+      "#<#{self.class.name} #{to_s}>"
     end
   end
 end

data/lib/or_tools/cp_model.rb

@@ -1,25 +1,34 @@
 module ORTools
   class CpModel
     def add(comparison)
-      method_name =
-        case comparison.operator
-        when "=="
-          :add_equality
-        when "!="
-          :add_not_equal
-        when ">"
-          :add_greater_than
-        when ">="
-          :add_greater_or_equal
-        when "<"
-          :add_less_than
-        when "<="
-          :add_less_or_equal
-        else
-          raise ArgumentError, "Unknown operator: #{comparison.operator}"
-        end
+      case comparison
+      when Comparison
+        method_name =
+          case comparison.operator
+          when "=="
+            :add_equality
+          when "!="
+            :add_not_equal
+          when ">"
+            :add_greater_than
+          when ">="
+            :add_greater_or_equal
+          when "<"
+            :add_less_than
+          when "<="
+            :add_less_or_equal
+          else
+            raise ArgumentError, "Unknown operator: #{comparison.operator}"
+          end
 
-      send(method_name, comparison.left, comparison.right)
+        send(method_name, comparison.left, comparison.right)
+      when true
+        add_bool_or([true_var])
+      when false
+        add_bool_or([])
+      else
+        raise TypeError, "Not supported: CpModel#add(#{comparison})"
+      end
     end
 
     def sum(arr)

data/lib/or_tools/mp_variable.rb

@@ -1,5 +1,4 @@
 module ORTools
-  # TODO change to VariableExpr in 0.8.0
   class MPVariable < LinearExpr
     def add_self_to_coeff_map_or_stack(coeffs, multiplier, stack)
       coeffs[self] += multiplier

data/lib/or_tools/product_cst.rb

@@ -13,7 +13,11 @@ module ORTools
       if @coef == -1
         "-#{@expr}"
       else
-        "(#{@coef} * #{@expr})"
+        expr = @expr.to_s
+        if expr.include?("+") || expr.include?("-")
+          expr = "(#{expr})"
+        end
+        "#{@coef} * #{expr}"
       end
     end
 

data/lib/or_tools/sat_int_var.rb

@@ -22,9 +22,8 @@ module ORTools
       name
     end
 
-    # TODO add class
     def inspect
-      to_s
+      "#<#{self.class.name} #{to_s}>"
     end
   end
 end

data/lib/or_tools/sat_linear_expr.rb

@@ -27,7 +27,7 @@ module ORTools
     def to_s
       vars.map do |v|
         k = v[0]
-        k = k.respond_to?(:name) ? k.name : k.inspect
+        k = k.respond_to?(:name) ? k.name : k.to_s
         if v[1] == 1
           k
         else
@@ -36,9 +36,8 @@ module ORTools
       end.join(" + ").sub(" + -", " - ")
     end
 
-    # TODO add class
     def inspect
-      to_s
+      "#<#{self.class.name} #{to_s}>"
     end
 
     private

data/lib/or_tools/sum_array.rb

@@ -17,7 +17,7 @@ module ORTools
     end
 
     def to_s
-      "(#{@array.map(&:to_s).join(" + ")})"
+      "#{@array.map(&:to_s).reject { |v| v == "0" }.join(" + ")}".gsub(" + -", " - ")
     end
   end
 end

data/lib/or_tools/version.rb

@@ -1,3 +1,3 @@
 module ORTools
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice