or-tools 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b7f1f552804f88337c4d277ac7062a984c13ea67e43a8cd5567e8c0b8f1b3c6
-  data.tar.gz: 5bd93184a59799ef541745a8f4498f4cf25c525c290c3c2c7fbe2d5e5494c942
+  metadata.gz: 3f76c7d5e0a5232ea519e3d96773c1c62ec718c4431f26d770db31881680662a
+  data.tar.gz: 951a90e2c6a30418ebc6c267a55205acb0946048278ee822912767b2a639ebc3
 SHA512:
-  metadata.gz: 91077d2961b42021ee98f580d132f99a84128354bd054053de600510c4aba7343e1da9696a5d08a7c214742b92cac45200f85aa136d3e092d77b25ceb4033cdc
-  data.tar.gz: 316c4c0423522a2bdb78e006d38c412aa94cbaa14b4a37ebd3c04f340752d5f2adc5a3a9f5cf4adbd6968627a8e0504b58ae77d1d0876eb46cab783843957ead
+  metadata.gz: be8e00e0553d9413a4d213af5647cccd46baaf3f724981c7e3234d08420cf44cc039a5ef24b6f35460ba36644d6690ba697b19c6f62a647a0ddda5af447f887d
+  data.tar.gz: 1219df9128db35f3fec3c040b19c9a66a26a08c9222a97ef10aec5c09173bb256e7c35cbeb528d6bf2c5f81ebc06c58149f3f2f48a8dc1e5ac370b668b6f20df

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 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
+
 ## 0.8.0 (2022-08-21)
 
 - Updated OR-Tools to 9.4
@@ -7,7 +16,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/vendor.rb

@@ -25,7 +25,10 @@ else
   os = os_info["ID"]
   os_version = os_info["VERSION_ID"]
 
-  if os == "ubuntu" && os_version == "20.04"
+  if os == "ubuntu" && os_version == "22.04"
+    filename = "or-tools_amd64_ubuntu-22.04_cpp_v#{version}.tar.gz"
+    checksum = "d7e222fc4f30c9864bfa3062accc8b4dd291c3166ba9cf3576c6c86eded71940"
+  elsif os == "ubuntu" && os_version == "20.04"
     filename = "or-tools_amd64_ubuntu-20.04_cpp_v#{version}.tar.gz"
     checksum = "1b09f0f60b5aab83aeec468842e4a166cd3a4e7910e807f55bc7f96d5dffabdb"
   elsif os == "ubuntu" && os_version == "18.04"

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-21 00:00:00.000000000 Z
+date: 2022-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice