or-tools 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a065257839dbcfaf581658f48c0aa1beeac58be2501dd5f8af71e071b3dba3b7
-  data.tar.gz: '0088e7e979a58ab54f8f1997fb9e60e0533d7c9e9412e40dd46840082123a7ef'
+  metadata.gz: 6c2f60a5c859f2659349bfb6f77336d2078f8d8747b76fcd8e3e10e7cfb25e28
+  data.tar.gz: a8d18cf5002f42735d1e458451f7902909ad7e552ed78e77ef52477108bbed16
 SHA512:
-  metadata.gz: cc1104b210214512d2467ad26ddcaf28b40a761ba675e7236908c067fa12e5b25858c61dc5972130fcab47460c0c8a080d963fd9e7af75847d1525bdb80b728b
-  data.tar.gz: f5365be019631c1684fbb274d5fff703de405771fd286ccb8047660fb88060a8bb77ace47a906e19ae12690488755c14222116f0c2210dc92bd7c2931567ed0f
+  metadata.gz: 7394863f44908fcadda86df82fa469c69e6178cdc376db90cc2a1d1142738af7f60b22eb0d66ad252ff1c8fd4a93d169194b462973ce158797519d0b5bb8a5dc
+  data.tar.gz: c8b8ca7f9f0c78e2dbf88555f23d5463e0b281e65afd83ebcd581062203d8b348aa76acf87f0bb55fef5736882cea48e33cd9a6f801addc60e80de9051b7fcf8

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.10.1 (2023-03-20)
+
+- Added `domain` method to `SatIntVar`
+- Added `add_linear_constraint` and `add_linear_expression_in_domain` methods to `CpModel`
+
 ## 0.10.0 (2023-03-15)
 
 - Updated OR-Tools to 9.6

data/ext/or-tools/constraint.cpp

@@ -3,6 +3,7 @@
 
 #include "ext.h"
 
+using operations_research::Domain;
 using operations_research::sat::BoolVar;
 using operations_research::sat::Constraint;
 using operations_research::sat::CpModelBuilder;
@@ -98,8 +99,14 @@ namespace Rice::detail
 }
 
 void init_constraint(Rice::Module& m) {
+  Rice::define_class_under<Domain>(m, "Domain")
+    .define_constructor(Rice::Constructor<Domain, int64_t, int64_t>())
+    .define_method("min", &Domain::Min)
+    .define_method("max", &Domain::Max);
+
   rb_cSatIntVar = Rice::define_class_under<IntVar>(m, "SatIntVar")
-    .define_method("name", &IntVar::Name);
+    .define_method("name", &IntVar::Name)
+    .define_method("domain", &IntVar::Domain);
 
   Rice::define_class_under<IntervalVar>(m, "SatIntervalVar")
     .define_method("name", &IntervalVar::Name);
@@ -230,12 +237,16 @@ void init_constraint(Rice::Module& m) {
       [](CpModelBuilder& self, LinearExpr x, LinearExpr y) {
         return self.AddLessThan(x, y);
       })
-    // TODO add domain
-    // .define_method(
-    //   "add_linear_constraint",
-    //   [](CpModelBuilder& self, LinearExpr expr, Domain domain) {
-    //     return self.AddLinearConstraint(expr, domain);
-    //   })
+    .define_method(
+      "add_linear_constraint",
+      [](CpModelBuilder& self, LinearExpr expr, int64_t lb, int64_t ub) {
+        return self.AddLinearConstraint(expr, Domain(lb, ub));
+      })
+    .define_method(
+      "add_linear_expression_in_domain",
+      [](CpModelBuilder& self, LinearExpr expr, Domain domain) {
+        return self.AddLinearConstraint(expr, domain);
+      })
     .define_method(
       "add_not_equal",
       [](CpModelBuilder& self, LinearExpr x, LinearExpr y) {

data/lib/or_tools/version.rb

@@ -1,3 +1,3 @@
 module ORTools
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice