colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweak rotated array stuff and tests.

Browse Source
This commit is contained in:
Ivan Malison 2015-07-26 02:17:35 -07:00
parent 9c3bcfcdc5
commit 9430c4f5bf
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dotfiles/lib/python/rotated_array.py
View File

@ -37,22 +37,6 @@ class RotatedArrayProxy(object):
else:
self._handle_slice(item)
def _handle_slice(self, item):
start = self._actual_index(item.start)
stop = self._actual_index(item.stop)
if start > stop:
sliced = self.incoming[start::item.stride]
# Ensure that the stride is preserved as it passes through
# the rotation.
start_index = (len(self.incoming) - start) % (item.stride or 1)
if start_index <= stop:
sliced.extend(
self.incoming[start_index:stop:item.stride]
)
return sliced
else:
return self.incoming[start:stop:item.stride]
def _actual_index(self, index):
if index is None:
return index
@ -89,3 +73,12 @@ class RotatedArrayProxy(object):
def unrotated(self):
return rotate_array(self.incoming, self.rotation_index)
def insert(self, x):
insertion_index = self.actual_insertion_index(x)
if insertion_index < self.rotation_index or (
insertion_index == self.rotation_index and
(not self.incoming or x < self.incoming[0])
):
self._rotation_index += 1
self.incoming.insert(self.actual_insertion_index(x), x)

13
dotfiles/lib/python/rotated_array_proxy_test.py
View File

@ -66,4 +66,15 @@ def test_rotation_index_and_unrotate():
def test_insert():
arr = [3]*117 + [1] + [2]*16
rap = rotated_array.RotatedArrayProxy(arr)
rap.insert(3)
rap.insert(3)
rap.insert(2)
rap.insert(2)
rap.insert(5)
rap.insert(24)
rap.insert(5)
rap.insert(4)
rap.insert(4)
assert rap.unrotated() == sorted(rap.incoming)