always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc

Browse Source
This commit is contained in:
Laurent Perron
2023-06-17 12:07:57 +02:00
parent bbbb0ea13d
commit a7889f05aa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ortools/gscip/gscip_parameters.cc
View File

@@ -32,7 +32,7 @@ constexpr absl::string_view kCatchCtrlCParam = "misc/catchctrlc";
} // namespace
void GScipSetTimeLimit(absl::Duration time_limit, GScipParameters* parameters) {
if (time_limit < absl::Seconds(1e20) && time_limit > absl::Duration()) {
if (time_limit < absl::Seconds(1e20) && time_limit >= absl::ZeroDuration()) {
(*parameters->mutable_real_params())[std::string(kLimitsTime)] =
absl::ToDoubleSeconds(time_limit);
} else {
@@ -47,7 +47,7 @@ absl::Duration GScipTimeLimit(const GScipParameters& parameters) {
if (scip_limit >= 1e20) {
return absl::InfiniteDuration();
} else if (scip_limit <= 0.0) {
return absl::Duration();
return absl::ZeroDuration();
} else {
return absl::Seconds(scip_limit);
}