-

cool-RR · cool-RR · commit 06d5a6d80021 · 2014-03-09T00:47:20.000+02:00
diff --git a/source_py3/python_toolbox/nifty_collections/emitting_ordered_set.py b/source_py3/python_toolbox/nifty_collections/emitting_ordered_set.py
@@ -27,10 +27,10 @@ def add(self, key):
         """ Add an element to a set.
     
         This has no effect if the element is already present. """
-        if key not in self.map:
-            end = self.end
+        if key not in self._map:
+            end = self._end
             curr = end[PREV]
-            curr[NEXT] = end[PREV] = self.map[key] = [key, curr, end]
+            curr[NEXT] = end[PREV] = self._map[key] = [key, curr, end]
             if self.emitter:
                 self.emitter.emit()
 
@@ -39,8 +39,8 @@ def discard(self, key):
         """ Remove an element from a set if it is a member.
         
         If the element is not a member, do nothing. """
-        if key in self.map:        
-            key, prev, next = self.map.pop(key)
+        if key in self._map:        
+            key, prev, next = self._map.pop(key)
             prev[NEXT] = next
             next[PREV] = prev
             if self.emitter:
diff --git a/source_py3/python_toolbox/nifty_collections/ordered_set.py b/source_py3/python_toolbox/nifty_collections/ordered_set.py
@@ -16,7 +16,7 @@
 KEY, PREV, NEXT = range(3)
 
 
-class OrderedSet(collections.MutableSet):
+class OrderedSet(collections.MutableSet, collections.Sequence):
     '''
     A set with an order.
     
@@ -33,7 +33,16 @@ def __init__(self, iterable=None):
     def clear(self):
         self._end = [] 
         self._end += [None, self._end, self._end]
-        self._map = {}                   
+        self._map = {}
+        
+        
+    def __getitem__(self, index):
+        for i, item in enumerate(self):
+            if i == index:
+                return item
+        else:
+            raise IndexError
+        
 
     def __len__(self):
         return len(self._map)
@@ -126,7 +135,6 @@ def sort(self, key=None, reverse=False):
         sorted_members = sorted(tuple(self), key=key_function, reverse=reverse)
         
         self.clear()
-        for member in sorted_members[1:]:
-            self.move_to_end(member)
+        self |= sorted_members
         
       
diff --git a/source_py3/test_python_toolbox/test_nifty_collections/test_ordered_dict/test.py b/source_py3/test_python_toolbox/test_nifty_collections/test_ordered_dict/test.py
@@ -40,7 +40,7 @@ def test_sort():
     assert second_ordered_dict == \
                            OrderedDict(((3+1j, 'a'), (1+2j, 'b'), (2+3j, 'c')))
     
-    second_ordered_dict.sort('real', reversed=True)
+    second_ordered_dict.sort('real', reverse=True)
     assert second_ordered_dict == \
                            OrderedDict(((3+1j, 'a'), (2+3j, 'c'), (1+2j, 'b')))
 
diff --git a/source_py3/test_python_toolbox/test_nifty_collections/test_ordered_set/test.py b/source_py3/test_python_toolbox/test_nifty_collections/test_ordered_set/test.py
@@ -8,7 +8,7 @@
 from python_toolbox.nifty_collections import OrderedSet
 
 
-def test_sort():
+def test():
     '''Test the basic workings of `OrderedSet`.'''
     
     ordered_set = OrderedSet(range(4))
@@ -25,4 +25,17 @@ def test_sort():
     assert list(reversed(ordered_set)) == [8, 3, 1, 0]
     assert ordered_set.pop() == 8
     assert ordered_set.pop(last=False) == 0
-    
+    
+    
+def test_sort():
+    
+    ordered_set = OrderedSet([5, 61, 2, 7, 2])
+    assert ordered_set == {5, 61, 2, 7}
+    ordered_set.move_to_end(61)
+    assert list(ordered_set) == [5, 2, 7, 61]
+    ordered_set.sort()
+    assert list(ordered_set) == [2, 5, 7, 61]
+    ordered_set.sort(key=lambda x: -x, reverse=True)
+    assert list(ordered_set) == [2, 5, 7, 61]
+    
+    
