or-tools 0.17.0 → 0.17.1
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/constraint.cpp +2 -2
- data/ext/or-tools/linear.cpp +10 -9
- data/ext/or-tools/routing.cpp +1 -1
- 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: 7d08782975a4c387d502318dbd8c9335166a42ab76807b13ba78c7b249d6c879
|
|
4
|
+
data.tar.gz: 1653c6a0bfac136e9bdbe22d6bc10bc24d699926d79963cb41777f9e90eb880f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 582adf83f9dfcdfe426364a22efc2bdd8733b5582a4aa3bb0b720910bd4a5d75a8466937b6b8bfed892c655017d246da3953081d56533a15aac8ae10b1ec96c5
|
|
7
|
+
data.tar.gz: e97b40eefc43fd253d2da0ad17f02a923649502d294904d49d4a431d1adc44c23222c8a59d61e36142400478bb6e128c90d00bee8419f0294c47f29aba4c4a93
|
data/CHANGELOG.md
CHANGED
data/ext/or-tools/constraint.cpp
CHANGED
|
@@ -98,8 +98,8 @@ void init_constraint(Rice::Module& m) {
|
|
|
98
98
|
auto a = Array(literal);
|
|
99
99
|
std::vector<BoolVar> vec;
|
|
100
100
|
vec.reserve(a.size());
|
|
101
|
-
for (const
|
|
102
|
-
if (v.is_a(rb_cSatIntVar)) {
|
|
101
|
+
for (const auto& v : a) {
|
|
102
|
+
if (Object(v).is_a(rb_cSatIntVar)) {
|
|
103
103
|
vec.push_back(Rice::detail::From_Ruby<IntVar>().convert(v.value()).ToBoolVar());
|
|
104
104
|
} else {
|
|
105
105
|
vec.push_back(Rice::detail::From_Ruby<BoolVar>().convert(v.value()));
|
data/ext/or-tools/linear.cpp
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
#include <memory>
|
|
2
|
+
#include <optional>
|
|
2
3
|
#include <string>
|
|
3
4
|
|
|
4
5
|
#include <ortools/linear_solver/linear_solver.h>
|
|
@@ -114,11 +115,11 @@ void init_linear(Rice::Module& m) {
|
|
|
114
115
|
[](MPSolverParameters& self) {
|
|
115
116
|
int presolve = self.GetIntegerParam(MPSolverParameters::IntegerParam::PRESOLVE);
|
|
116
117
|
if (presolve == MPSolverParameters::PresolveValues::PRESOLVE_ON) {
|
|
117
|
-
return
|
|
118
|
+
return std::optional<bool>{true};
|
|
118
119
|
} else if (presolve == MPSolverParameters::PresolveValues::PRESOLVE_OFF) {
|
|
119
|
-
return
|
|
120
|
+
return std::optional<bool>{false};
|
|
120
121
|
} else {
|
|
121
|
-
return
|
|
122
|
+
return std::optional<bool>{};
|
|
122
123
|
}
|
|
123
124
|
})
|
|
124
125
|
.define_method(
|
|
@@ -137,11 +138,11 @@ void init_linear(Rice::Module& m) {
|
|
|
137
138
|
[](MPSolverParameters& self) {
|
|
138
139
|
int incrementality = self.GetIntegerParam(MPSolverParameters::IntegerParam::INCREMENTALITY);
|
|
139
140
|
if (incrementality == MPSolverParameters::IncrementalityValues::INCREMENTALITY_ON) {
|
|
140
|
-
return
|
|
141
|
+
return std::optional<bool>{true};
|
|
141
142
|
} else if (incrementality == MPSolverParameters::IncrementalityValues::INCREMENTALITY_OFF) {
|
|
142
|
-
return
|
|
143
|
+
return std::optional<bool>{false};
|
|
143
144
|
} else {
|
|
144
|
-
return
|
|
145
|
+
return std::optional<bool>{};
|
|
145
146
|
}
|
|
146
147
|
})
|
|
147
148
|
.define_method(
|
|
@@ -160,11 +161,11 @@ void init_linear(Rice::Module& m) {
|
|
|
160
161
|
[](MPSolverParameters& self) {
|
|
161
162
|
int scaling = self.GetIntegerParam(MPSolverParameters::IntegerParam::SCALING);
|
|
162
163
|
if (scaling == MPSolverParameters::ScalingValues::SCALING_ON) {
|
|
163
|
-
return
|
|
164
|
+
return std::optional<bool>{true};
|
|
164
165
|
} else if (scaling == MPSolverParameters::ScalingValues::SCALING_OFF) {
|
|
165
|
-
return
|
|
166
|
+
return std::optional<bool>{false};
|
|
166
167
|
} else {
|
|
167
|
-
return
|
|
168
|
+
return std::optional<bool>{};
|
|
168
169
|
}
|
|
169
170
|
});
|
|
170
171
|
|
data/ext/or-tools/routing.cpp
CHANGED
|
@@ -295,7 +295,7 @@ void init_routing(Rice::Module& m) {
|
|
|
295
295
|
"cumulative",
|
|
296
296
|
[](operations_research::Solver& self, Array rb_intervals, std::vector<int64_t> demands, int64_t capacity, const std::string& name) {
|
|
297
297
|
std::vector<operations_research::IntervalVar*> intervals;
|
|
298
|
-
for (const
|
|
298
|
+
for (const auto& v : rb_intervals) {
|
|
299
299
|
intervals.push_back(Rice::detail::From_Ruby<operations_research::IntervalVar*>().convert(v.value()));
|
|
300
300
|
}
|
|
301
301
|
return self.MakeCumulative(intervals, demands, capacity, name);
|
data/lib/or_tools/version.rb
CHANGED