or-tools 0.15.1 → 0.16.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/ext/or-tools/network_flows.cpp +3 -4
- data/ext/or-tools/vendor.rb +19 -19
- data/lib/or_tools/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a2c9e5edffd049efefd022fbb2d8473e922adb0d2d4bc7ca03fa87ec823929be
|
4
|
+
data.tar.gz: 9825d9ab9fe616f263a8c5bfa23f57795fee798c486ef6ad6aa34bd4c47a5dac
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 53958c2e8aff5a55240cc19b8423d5c6cd8244214b26a79d969fe920f8faab2ad354ff7ef62039b05071d7b166436696152ffd141dff68451f8c09f8d119d83f
|
7
|
+
data.tar.gz: 7abb3a8c5507f11796743b505351f285cbad89ab366fda35ae6b084f1835dcab8905f02fcb91e091bbeb142d097a8b314aadddc51a94d8285d257b6601e2e769
|
data/CHANGELOG.md
CHANGED
@@ -5,7 +5,6 @@
|
|
5
5
|
#include <rice/rice.hpp>
|
6
6
|
#include <rice/stl.hpp>
|
7
7
|
|
8
|
-
using operations_research::NodeIndex;
|
9
8
|
using operations_research::SimpleMaxFlow;
|
10
9
|
using operations_research::SimpleMinCostFlow;
|
11
10
|
|
@@ -25,7 +24,7 @@ void init_network_flows(Rice::Module& m) {
|
|
25
24
|
.define_method("flow", &SimpleMaxFlow::Flow)
|
26
25
|
.define_method(
|
27
26
|
"solve",
|
28
|
-
[](SimpleMaxFlow& self, NodeIndex source, NodeIndex sink) {
|
27
|
+
[](SimpleMaxFlow& self, SimpleMaxFlow::NodeIndex source, SimpleMaxFlow::NodeIndex sink) {
|
29
28
|
auto status = self.Solve(source, sink);
|
30
29
|
|
31
30
|
if (status == SimpleMaxFlow::Status::OPTIMAL) {
|
@@ -43,7 +42,7 @@ void init_network_flows(Rice::Module& m) {
|
|
43
42
|
.define_method(
|
44
43
|
"source_side_min_cut",
|
45
44
|
[](SimpleMaxFlow& self) {
|
46
|
-
std::vector<NodeIndex> result;
|
45
|
+
std::vector<SimpleMaxFlow::NodeIndex> result;
|
47
46
|
self.GetSourceSideMinCut(&result);
|
48
47
|
|
49
48
|
Array ret;
|
@@ -55,7 +54,7 @@ void init_network_flows(Rice::Module& m) {
|
|
55
54
|
.define_method(
|
56
55
|
"sink_side_min_cut",
|
57
56
|
[](SimpleMaxFlow& self) {
|
58
|
-
std::vector<NodeIndex> result;
|
57
|
+
std::vector<SimpleMaxFlow::NodeIndex> result;
|
59
58
|
self.GetSinkSideMinCut(&result);
|
60
59
|
|
61
60
|
Array ret;
|
data/ext/or-tools/vendor.rb
CHANGED
@@ -3,18 +3,18 @@ require "fileutils"
|
|
3
3
|
require "net/http"
|
4
4
|
require "tmpdir"
|
5
5
|
|
6
|
-
version = "9.
|
6
|
+
version = "9.14.6206"
|
7
7
|
|
8
8
|
arch = RbConfig::CONFIG["host_cpu"]
|
9
9
|
arm = arch.match?(/arm|aarch64/i)
|
10
10
|
|
11
11
|
if RbConfig::CONFIG["host_os"].match?(/darwin/i)
|
12
12
|
if arm
|
13
|
-
filename = "or-tools_arm64_macOS-15.
|
14
|
-
checksum = "
|
13
|
+
filename = "or-tools_arm64_macOS-15.5_cpp_v#{version}.tar.gz"
|
14
|
+
checksum = "7dd3fc35acc74a85f44e39099dcc2caa698d7a99e659e8d8456ce25bafe4a63b"
|
15
15
|
else
|
16
|
-
filename = "or-tools_x86_64_macOS-15.
|
17
|
-
checksum = "
|
16
|
+
filename = "or-tools_x86_64_macOS-15.5_cpp_v#{version}.tar.gz"
|
17
|
+
checksum = "de7ed91b0fe90094fb5f5ebd19869b69a8d52b9752e456752208a22a05b14f7f"
|
18
18
|
end
|
19
19
|
else
|
20
20
|
# try /etc/os-release with fallback to /usr/lib/os-release
|
@@ -29,22 +29,22 @@ else
|
|
29
29
|
|
30
30
|
if os == "ubuntu" && os_version == "24.04" && !arm
|
31
31
|
filename = "or-tools_amd64_ubuntu-24.04_cpp_v#{version}.tar.gz"
|
32
|
-
checksum = "
|
32
|
+
checksum = "be3855a32a7390c3957d43ebd3faec1610acdc28f06ef33cb50f1f72a9aa6621"
|
33
33
|
elsif os == "ubuntu" && os_version == "22.04" && !arm
|
34
34
|
filename = "or-tools_amd64_ubuntu-22.04_cpp_v#{version}.tar.gz"
|
35
|
-
checksum = "
|
35
|
+
checksum = "127a82bbbf304d26721bb9b41ecce2d66f21c757204ab5aa2cc37eaa6ffb7eb6"
|
36
36
|
elsif os == "ubuntu" && os_version == "20.04" && !arm
|
37
37
|
filename = "or-tools_amd64_ubuntu-20.04_cpp_v#{version}.tar.gz"
|
38
|
-
checksum = "
|
38
|
+
checksum = "7705a7c11e0db4ec1d7841e184acd204787174c6cbdb2fbd81169823ed148c6c"
|
39
39
|
elsif os == "debian" && os_version == "11" && !arm
|
40
40
|
filename = "or-tools_amd64_debian-11_cpp_v#{version}.tar.gz"
|
41
|
-
checksum = "
|
41
|
+
checksum = "646b53e8d355290c4627d6bad0d36baeff38dc43605d317ac02cb811688d4dd2"
|
42
42
|
elsif os == "debian" && os_version == "12" && !arm
|
43
43
|
filename = "or-tools_amd64_debian-12_cpp_v#{version}.tar.gz"
|
44
|
-
checksum = "
|
44
|
+
checksum = "285e8ec3a3399e45cdb4f67f48d4b65dbfa9c013b29036d409c72f96f0f34ab9"
|
45
45
|
elsif os == "arch" && !arm
|
46
46
|
filename = "or-tools_amd64_archlinux_cpp_v#{version}.tar.gz"
|
47
|
-
checksum = "
|
47
|
+
checksum = "6be039a13c3be7a3dbcdc413d455b43bba4590ce38859062898835effefb5ca4"
|
48
48
|
else
|
49
49
|
platform =
|
50
50
|
if Gem.win_platform?
|
@@ -127,14 +127,6 @@ Dir.mktmpdir do |extract_path|
|
|
127
127
|
tar_args = Gem.win_platform? ? ["--force-local"] : []
|
128
128
|
system "tar", "zxf", download_path, "-C", extract_path, "--strip-components=1", *tar_args
|
129
129
|
|
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
|
-
|
138
130
|
# include
|
139
131
|
FileUtils.mv(File.join(extract_path, "include"), File.join(path, "include"))
|
140
132
|
|
@@ -144,6 +136,14 @@ Dir.mktmpdir do |extract_path|
|
|
144
136
|
next if file.include?("libprotoc.")
|
145
137
|
FileUtils.mv(File.join(extract_path, file), File.join(path, file))
|
146
138
|
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
|
147
147
|
end
|
148
148
|
|
149
149
|
# export
|
data/lib/or_tools/version.rb
CHANGED