or-tools 0.9.1 → 0.10.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +9 -0
  3. data/ext/or-tools/constraint.cpp +18 -7
  4. data/ext/or-tools/ext.cpp +1 -1
  5. data/ext/or-tools/vendor.rb +12 -12
  6. data/lib/or_tools/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bab501da2187c3426bc8bb6a6c5e034a5995f4dcb33efee1df302a4465eac105
4
- data.tar.gz: ea4a061510dfb8fe566d4a52763bc3d0e65b342e31848b255c770fbcf22a410b
3
+ metadata.gz: 6c2f60a5c859f2659349bfb6f77336d2078f8d8747b76fcd8e3e10e7cfb25e28
4
+ data.tar.gz: a8d18cf5002f42735d1e458451f7902909ad7e552ed78e77ef52477108bbed16
5
5
  SHA512:
6
- metadata.gz: 603dd8a2db9e6ac69bffd6a8c1b405b75763a3965f655633f80c6bff5cf3a3c5419c7cb7d0d008ce4783937d1628289f27a344ec8f468603e3c7135158880845
7
- data.tar.gz: 90659981897847d2c3c89afb0c9bdc86300990a4766812fd742ea4ea5901e8d246fbda2ff9e36ed28fe9828fe70e36246ad8cbe7a25eff2db0ef4c96b750d9a4
6
+ metadata.gz: 7394863f44908fcadda86df82fa469c69e6178cdc376db90cc2a1d1142738af7f60b22eb0d66ad252ff1c8fd4a93d169194b462973ce158797519d0b5bb8a5dc
7
+ data.tar.gz: c8b8ca7f9f0c78e2dbf88555f23d5463e0b281e65afd83ebcd581062203d8b348aa76acf87f0bb55fef5736882cea48e33cd9a6f801addc60e80de9051b7fcf8
data/CHANGELOG.md CHANGED
@@ -1,3 +1,12 @@
1
+ ## 0.10.1 (2023-03-20)
2
+
3
+ - Added `domain` method to `SatIntVar`
4
+ - Added `add_linear_constraint` and `add_linear_expression_in_domain` methods to `CpModel`
5
+
6
+ ## 0.10.0 (2023-03-15)
7
+
8
+ - Updated OR-Tools to 9.6
9
+
1
10
  ## 0.9.1 (2023-03-11)
2
11
 
3
12
  - Added `solution_info` to `CpSolver`
data/ext/or-tools/constraint.cpp CHANGED
@@ -3,6 +3,7 @@
3
3
 
4
4
  #include "ext.h"
5
5
 
6
+ using operations_research::Domain;
6
7
  using operations_research::sat::BoolVar;
7
8
  using operations_research::sat::Constraint;
8
9
  using operations_research::sat::CpModelBuilder;
@@ -98,8 +99,14 @@ namespace Rice::detail
98
99
  }
99
100
 
100
101
  void init_constraint(Rice::Module& m) {
102
+ Rice::define_class_under<Domain>(m, "Domain")
103
+ .define_constructor(Rice::Constructor<Domain, int64_t, int64_t>())
104
+ .define_method("min", &Domain::Min)
105
+ .define_method("max", &Domain::Max);
106
+
101
107
  rb_cSatIntVar = Rice::define_class_under<IntVar>(m, "SatIntVar")
102
- .define_method("name", &IntVar::Name);
108
+ .define_method("name", &IntVar::Name)
109
+ .define_method("domain", &IntVar::Domain);
103
110
 
104
111
  Rice::define_class_under<IntervalVar>(m, "SatIntervalVar")
105
112
  .define_method("name", &IntervalVar::Name);
@@ -230,12 +237,16 @@ void init_constraint(Rice::Module& m) {
230
237
  [](CpModelBuilder& self, LinearExpr x, LinearExpr y) {
231
238
  return self.AddLessThan(x, y);
232
239
  })
233
- // TODO add domain
234
- // .define_method(
235
- // "add_linear_constraint",
236
- // [](CpModelBuilder& self, LinearExpr expr, Domain domain) {
237
- // return self.AddLinearConstraint(expr, domain);
238
- // })
240
+ .define_method(
241
+ "add_linear_constraint",
242
+ [](CpModelBuilder& self, LinearExpr expr, int64_t lb, int64_t ub) {
243
+ return self.AddLinearConstraint(expr, Domain(lb, ub));
244
+ })
245
+ .define_method(
246
+ "add_linear_expression_in_domain",
247
+ [](CpModelBuilder& self, LinearExpr expr, Domain domain) {
248
+ return self.AddLinearConstraint(expr, domain);
249
+ })
239
250
  .define_method(
240
251
  "add_not_equal",
241
252
  [](CpModelBuilder& self, LinearExpr x, LinearExpr y) {
data/ext/or-tools/ext.cpp CHANGED
@@ -30,7 +30,7 @@ void Init_ext()
30
30
  // fix logging warning
31
31
  CppBridge::InitLogging("");
32
32
  CppFlags flags = CppFlags();
33
- flags.logtostderr = true;
33
+ flags.stderrthreshold = 2;
34
34
  flags.log_prefix = false;
35
35
  CppBridge::SetFlags(flags);
36
36
  }
data/ext/or-tools/vendor.rb CHANGED
@@ -4,15 +4,15 @@ require "fileutils"
4
4
  require "net/http"
5
5
  require "tmpdir"
6
6
 
7
- version = "9.5.2237"
7
+ version = "9.6.2534"
8
8
 
9
9
  if RbConfig::CONFIG["host_os"] =~ /darwin/i
10
10
  if RbConfig::CONFIG["host_cpu"] =~ /arm|aarch64/i
11
- filename = "or-tools_arm64_macOS-13.0.1_cpp_v#{version}.tar.gz"
12
- checksum = "9041ccb29618bce793c68eaa30a01b1fbaa6491656bddd942753d9a412544db7"
11
+ filename = "or-tools_arm64_macOS-13.2.1_cpp_v#{version}.tar.gz"
12
+ checksum = "bb82c3b071e8ea5366a52137f400b280120221611758e38bf3d55c819f81c34b"
13
13
  else
14
- filename = "or-tools_x86_64_macOS-13.0.1_cpp_v#{version}.tar.gz"
15
- checksum = "f4af2bfd3b19cff6056e01abcddf1f5a54a0da891cafd73a25a671a3abd17c76"
14
+ filename = "or-tools_x86_64_macOS-13.2.1_cpp_v#{version}.tar.gz"
15
+ checksum = "0957ed39792d5f6135edf86ed75e78fff5b2f36ec0ae63e30c46bd6a6a97797f"
16
16
  end
17
17
  else
18
18
  # try /etc/os-release with fallback to /usr/lib/os-release
@@ -27,25 +27,25 @@ else
27
27
 
28
28
  if os == "ubuntu" && os_version == "22.04"
29
29
  filename = "or-tools_amd64_ubuntu-22.04_cpp_v#{version}.tar.gz"
30
- checksum = "acecd79867f4bd5f6b91d95743fc858e939d8611e534914a540ee4f46c535247"
30
+ checksum = "e7960113b156b13e23a179ca09646845e762f452aa525bf9b12a40e5ae3c6ca4"
31
31
  elsif os == "ubuntu" && os_version == "20.04"
32
32
  filename = "or-tools_amd64_ubuntu-20.04_cpp_v#{version}.tar.gz"
33
- checksum = "506b420e1b1232440e49680e55ae087000f2c92b1009e46417c774d8332f217b"
33
+ checksum = "aff9714ee8ffd1c936024d6a754f697cf80d4fd5aafa4cf121a4dde114f3813f"
34
34
  elsif os == "ubuntu" && os_version == "18.04"
35
35
  filename = "or-tools_amd64_ubuntu-18.04_cpp_v#{version}.tar.gz"
36
- checksum = "96ee5b4f3cf6dfece6dc54a78c6aa4a55dae5bd7d4f4176b332d3f3aa6cd973f"
36
+ checksum = "467713721be3fdc709cc7fd0c8d6ad99dda73cab1b9c5de3568336c6ebef6473"
37
37
  elsif os == "debian" && os_version == "11"
38
38
  filename = "or-tools_amd64_debian-11_cpp_v#{version}.tar.gz"
39
- checksum = "00bef600d0e2452544484f26f49bada4f717d7735f9d65c3961def8ab83876d3"
39
+ checksum = "4191e3e910156d6e9d6e69fb9ab6ed57c683f018b218b46cce91c7ece6549dc6"
40
40
  elsif os == "debian" && os_version == "10"
41
41
  filename = "or-tools_amd64_debian-10_cpp_v#{version}.tar.gz"
42
- checksum = "a45c566dbfe818386bc1aa061a167650c691f447b2937cdc8bdb1e9054ba4715"
42
+ checksum = "f141f16cf92877ed5819e0104126a31c9c139c070de06d7f40c957a4e6ce9284"
43
43
  elsif os == "centos" && os_version == "8"
44
44
  filename = "or-tools_amd64_centos-8_cpp_v#{version}.tar.gz"
45
- checksum = "af82328d06c402917735482045e7abc37a6f9258db3d607d6efc62c27f765334"
45
+ checksum = "05e2dfc5c82d5122e0c26ce4548cddcae2d474b3b18c024bc189dab887357157"
46
46
  elsif os == "centos" && os_version == "7"
47
47
  filename = "or-tools_amd64_centos-7_cpp_v#{version}.tar.gz"
48
- checksum = "3d28bdd3ab27224b80960393c7f51e7c228ae78297c28e4ae79bc6c269ae44fe"
48
+ checksum = "96012ac1280a98d6a67e764494bf60971eece859dca95fb6470ffd4065af7444"
49
49
  else
50
50
  platform =
51
51
  if Gem.win_platform?
data/lib/or_tools/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ORTools
2
- VERSION = "0.9.1"
2
+ VERSION = "0.10.1"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: or-tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.1
4
+ version: 0.10.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrew Kane
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-03-11 00:00:00.000000000 Z
11
+ date: 2023-03-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rice