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

using uint64 overflow instead of int64 overflow which are undefined

Browse Source
This commit is contained in:
Laurent Perron
2017-09-06 10:18:39 +02:00
parent e907d4b77b
commit 1ce1ff7e8b
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ortools/util/piecewise_linear_function.cc
View File

@@ -135,7 +135,7 @@ int64 PiecewiseSegment::SafeValuePostReference(int64 x) const {
return unsigned_sum > kint64max ? kint64max
: static_cast<int64>(unsigned_sum);
} else {
const uint64 opp_reference_y = static_cast<uint64>(-reference_y_);
const uint64 opp_reference_y = -static_cast<uint64>(reference_y_);
if (span_y >= opp_reference_y) {
return span_y - opp_reference_y > kint64max
? kint64max
@@ -152,7 +152,7 @@ int64 PiecewiseSegment::SafeValuePostReference(int64 x) const {
if (reference_y_ == 0) {
return span_y > kint64max ? kint64min : -static_cast<int64>(span_y);
} else if (reference_y_ < 0) {
const uint64 opp_reference_y = static_cast<uint64>(-reference_y_);
const uint64 opp_reference_y = -static_cast<uint64>(reference_y_);
const uint64 opp_unsigned_sum = UnsignedCapAdd(opp_reference_y, span_y);
return opp_unsigned_sum > kint64max
? kint64min
@@ -193,7 +193,7 @@ int64 PiecewiseSegment::SafeValuePreReference(int64 x) const {
: -static_cast<uint64>(span_y - reference_y_);
}
} else {
const uint64 opp_reference_y = static_cast<uint64>(-reference_y_);
const uint64 opp_reference_y = -static_cast<uint64>(reference_y_);
const uint64 opp_unsigned_sum = UnsignedCapAdd(opp_reference_y, span_y);
return opp_unsigned_sum > kint64max
? kint64min
@@ -205,7 +205,7 @@ int64 PiecewiseSegment::SafeValuePreReference(int64 x) const {
if (reference_y_ == 0) {
return span_y > kint64max ? kint64max : span_y;
} else if (reference_y_ < 0) {
const uint64 opp_reference_y = static_cast<uint64>(-reference_y_);
const uint64 opp_reference_y = -static_cast<uint64>(reference_y_);
if (span_y >= opp_reference_y) {
return span_y - opp_reference_y > kint64max
? kint64max

5
ortools/util/sorted_interval_list.cc
View File

@@ -385,7 +385,10 @@ SortedDisjointIntervalList::Iterator SortedDisjointIntervalList::GrowRightByOne(
auto it_prev = it;
// No interval containing or adjacent to "value" on the left (i.e. below).
if (it == begin() || ((--it_prev)->end < value - 1 && value != kint64min)) {
if (it != begin()) {
--it_prev;
}
if (it == begin() || ((value != kint64min) && it_prev->end < value - 1)) {
*newly_covered = value;
if (it == end() || it->start != value + 1) {
// No interval adjacent to "value" on the right: insert a singleton.