Skip to content

Commit 3f80d56

Browse files
committed
Updated OR-Tools to 9.14
1 parent d79d976 commit 3f80d56

File tree

4 files changed

+28
-25
lines changed

4 files changed

+28
-25
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.16.0 (unreleased)
2+
3+
- Updated OR-Tools to 9.14
4+
15
## 0.15.1 (2025-06-18)
26

37
- Fixed error with Rice 4.6

Rakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ task :update do
2525
require "open-uri"
2626
require "tmpdir"
2727

28-
version = "9.12.4544"
29-
distributions = ["arm64_macOS-15.3.1", "x86_64_macOS-15.3.1", "amd64_ubuntu-24.04", "amd64_ubuntu-22.04", "amd64_ubuntu-20.04", "amd64_debian-11", "amd64_debian-12", "amd64_archlinux"]
28+
version = "9.14.6206"
29+
distributions = ["arm64_macOS-15.5", "x86_64_macOS-15.5", "amd64_ubuntu-24.04", "amd64_ubuntu-22.04", "amd64_ubuntu-20.04", "amd64_debian-11", "amd64_debian-12", "amd64_archlinux"]
3030

3131
short_version = version.split(".").first(2).join(".")
3232
distributions.each do |dist|

ext/or-tools/network_flows.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include <rice/rice.hpp>
66
#include <rice/stl.hpp>
77

8-
using operations_research::NodeIndex;
98
using operations_research::SimpleMaxFlow;
109
using operations_research::SimpleMinCostFlow;
1110

@@ -25,7 +24,7 @@ void init_network_flows(Rice::Module& m) {
2524
.define_method("flow", &SimpleMaxFlow::Flow)
2625
.define_method(
2726
"solve",
28-
[](SimpleMaxFlow& self, NodeIndex source, NodeIndex sink) {
27+
[](SimpleMaxFlow& self, SimpleMaxFlow::NodeIndex source, SimpleMaxFlow::NodeIndex sink) {
2928
auto status = self.Solve(source, sink);
3029

3130
if (status == SimpleMaxFlow::Status::OPTIMAL) {
@@ -43,7 +42,7 @@ void init_network_flows(Rice::Module& m) {
4342
.define_method(
4443
"source_side_min_cut",
4544
[](SimpleMaxFlow& self) {
46-
std::vector<NodeIndex> result;
45+
std::vector<SimpleMaxFlow::NodeIndex> result;
4746
self.GetSourceSideMinCut(&result);
4847

4948
Array ret;
@@ -55,7 +54,7 @@ void init_network_flows(Rice::Module& m) {
5554
.define_method(
5655
"sink_side_min_cut",
5756
[](SimpleMaxFlow& self) {
58-
std::vector<NodeIndex> result;
57+
std::vector<SimpleMaxFlow::NodeIndex> result;
5958
self.GetSinkSideMinCut(&result);
6059

6160
Array ret;

ext/or-tools/vendor.rb

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
require "net/http"
44
require "tmpdir"
55

6-
version = "9.12.4544"
6+
version = "9.14.6206"
77

88
arch = RbConfig::CONFIG["host_cpu"]
99
arm = arch.match?(/arm|aarch64/i)
1010

1111
if RbConfig::CONFIG["host_os"].match?(/darwin/i)
1212
if arm
13-
filename = "or-tools_arm64_macOS-15.3.1_cpp_v#{version}.tar.gz"
14-
checksum = "02f89e54bd8d86e6e069f843aeed10a444ff329052e5a7fd732c5e4ec4f845fb"
13+
filename = "or-tools_arm64_macOS-15.5_cpp_v#{version}.tar.gz"
14+
checksum = "7dd3fc35acc74a85f44e39099dcc2caa698d7a99e659e8d8456ce25bafe4a63b"
1515
else
16-
filename = "or-tools_x86_64_macOS-15.3.1_cpp_v#{version}.tar.gz"
17-
checksum = "515af60e73e7fa620bab7f4a7d60b9069075d814453d91906aa39993d714f28d"
16+
filename = "or-tools_x86_64_macOS-15.5_cpp_v#{version}.tar.gz"
17+
checksum = "de7ed91b0fe90094fb5f5ebd19869b69a8d52b9752e456752208a22a05b14f7f"
1818
end
1919
else
2020
# try /etc/os-release with fallback to /usr/lib/os-release
@@ -29,22 +29,22 @@
2929

3030
if os == "ubuntu" && os_version == "24.04" && !arm
3131
filename = "or-tools_amd64_ubuntu-24.04_cpp_v#{version}.tar.gz"
32-
checksum = "71128e095024707bf9835faf4558cbe34acb79345e899bd532f3008a493a8970"
32+
checksum = "be3855a32a7390c3957d43ebd3faec1610acdc28f06ef33cb50f1f72a9aa6621"
3333
elsif os == "ubuntu" && os_version == "22.04" && !arm
3434
filename = "or-tools_amd64_ubuntu-22.04_cpp_v#{version}.tar.gz"
35-
checksum = "cb42ea7d7799a01fea7cdaafacbdfc67180d85f39532c6d2a8c4cfb419bd07ed"
35+
checksum = "127a82bbbf304d26721bb9b41ecce2d66f21c757204ab5aa2cc37eaa6ffb7eb6"
3636
elsif os == "ubuntu" && os_version == "20.04" && !arm
3737
filename = "or-tools_amd64_ubuntu-20.04_cpp_v#{version}.tar.gz"
38-
checksum = "ea51589fe80bd9cd4fb6203bd1e956b311cdb1d21bbd14f7b6dad75c81d3583c"
38+
checksum = "7705a7c11e0db4ec1d7841e184acd204787174c6cbdb2fbd81169823ed148c6c"
3939
elsif os == "debian" && os_version == "11" && !arm
4040
filename = "or-tools_amd64_debian-11_cpp_v#{version}.tar.gz"
41-
checksum = "dcee63b726569bd99c134e0e920173f955feae5856c3370a0bed03fdc995af50"
41+
checksum = "646b53e8d355290c4627d6bad0d36baeff38dc43605d317ac02cb811688d4dd2"
4242
elsif os == "debian" && os_version == "12" && !arm
4343
filename = "or-tools_amd64_debian-12_cpp_v#{version}.tar.gz"
44-
checksum = "911143f50fe013fbd50d0dce460512106596adfc0f2ad9a2bc8afd218531bde4"
44+
checksum = "285e8ec3a3399e45cdb4f67f48d4b65dbfa9c013b29036d409c72f96f0f34ab9"
4545
elsif os == "arch" && !arm
4646
filename = "or-tools_amd64_archlinux_cpp_v#{version}.tar.gz"
47-
checksum = "18c1d929e2144e9d9602659ea2fa790bd2a150f72c32c38a97f571839816d132"
47+
checksum = "6be039a13c3be7a3dbcdc413d455b43bba4590ce38859062898835effefb5ca4"
4848
else
4949
platform =
5050
if Gem.win_platform?
@@ -127,14 +127,6 @@ def download_file(url, download_path, redirects = 0)
127127
tar_args = Gem.win_platform? ? ["--force-local"] : []
128128
system "tar", "zxf", download_path, "-C", extract_path, "--strip-components=1", *tar_args
129129

130-
# licenses
131-
license_files = Dir.glob("**/*{LICENSE,LICENCE,NOTICE,COPYING,license,licence,notice,copying}*", base: extract_path)
132-
raise "License not found" unless license_files.any?
133-
license_files.each do |file|
134-
FileUtils.mkdir_p(File.join(path, File.dirname(file)))
135-
FileUtils.mv(File.join(extract_path, file), File.join(path, file))
136-
end
137-
138130
# include
139131
FileUtils.mv(File.join(extract_path, "include"), File.join(path, "include"))
140132

@@ -144,6 +136,14 @@ def download_file(url, download_path, redirects = 0)
144136
next if file.include?("libprotoc.")
145137
FileUtils.mv(File.join(extract_path, file), File.join(path, file))
146138
end
139+
140+
# licenses
141+
license_files = Dir.glob("**/*{LICENSE,LICENCE,NOTICE,COPYING,license,licence,notice,copying}*", base: extract_path)
142+
raise "License not found" unless license_files.any?
143+
license_files.each do |file|
144+
FileUtils.mkdir_p(File.join(path, File.dirname(file)))
145+
FileUtils.mv(File.join(extract_path, file), File.join(path, file))
146+
end
147147
end
148148

149149
# export

0 commit comments

Comments
 (0)