tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

DO NOT MERGE rangelib.py: Fix the bug in monotonic check. am: 16536a53a0

Browse source 
am: 801dc8925f

* commit '801dc8925fcc148f438ceca751b2c14a853bece7':
  DO NOT MERGE rangelib.py: Fix the bug in monotonic check.

Change-Id: I98966afb7be0c91d4985985a5abd05fee05e0d8f
This commit is contained in:
Tao Bao 2016-05-13 22:41:42 +00:00 committed by android-build-merger
commit cb5268ef2e
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tools/releasetools/rangelib.py
View file

@ -24,12 +24,13 @@ class RangeSet(object):
lots of runs."""
def __init__(self, data=None):
# TODO(tbao): monotonic is broken when passing in a tuple.
self.monotonic = False
if isinstance(data, str):
self._parse_internal(data)
elif data:
assert len(data) % 2 == 0
self.data = tuple(self._remove_pairs(data))
self.monotonic = all(x < y for x, y in zip(self.data, self.data[1:]))
else:
self.data = ()
@ -39,8 +40,10 @@ class RangeSet(object):
def __eq__(self, other):
return self.data == other.data
def __ne__(self, other):
return self.data != other.data
def __nonzero__(self):
return bool(self.data)
@ -74,9 +77,9 @@ class RangeSet(object):
monotonic = True
for p in text.split():
if "-" in p:
s, e = p.split("-")
data.append(int(s))
data.append(int(e)+1)
s, e = (int(x) for x in p.split("-"))
data.append(s)
data.append(e+1)
if last <= s <= e:
last = e
else:
@ -95,6 +98,9 @@ class RangeSet(object):
@staticmethod
def _remove_pairs(source):
"""Remove consecutive duplicate items to simplify the result.
[1, 2, 2, 5, 5, 10] will become [1, 10]."""
last = None
for i in source:
if i == last:
@ -117,6 +123,7 @@ class RangeSet(object):
return " ".join(out)
def to_string_raw(self):
assert self.data
return str(len(self.data)) + "," + ",".join(str(i) for i in self.data)
def union(self, other):