various fixes

sortedlist.py

@@ -15,6 +15,12 @@ class sortedlist:
     def __len__(self):
         return len(self.data)
     
+    def __repr__(self):
+        ret = 'sortedlist('
+        for i in self.data:
+            ret += str(i) + ', '
+        return ret[:-2] + ')'
+    
     def __str__(self):
         return str(self.data)
     
@@ -23,11 +29,11 @@ class sortedlist:
     
     def __add__(self, operand):
         if isinstance(operand, list):
-			return sortedlist(self.merge(self.data, sorted(operand)), True)
+            return sortedlist(self.merge(self.data, sorted(operand)), presorted=True)
         elif isinstance(operand, sortedlist):
-			return sortedlist(self.merge(self.data, operand.data), True)
+            return sortedlist(self.merge(self.data, operand.data), presorted=True)
         else:
-			raise TypeError('can only concatenate list or sortedlist (not "%s") to sortedlist' % type(operand).__name__)
+            return NotImplemented
     
     #because of sorting, addition is commutative (a + b == b + a)
     def __radd__(self, operand):
@@ -35,6 +41,7 @@ class sortedlist:
     
     def __iadd__(self, operand):
         self.data = (self + operand).data
+        return self
     
     #takes two sorted lists (not sortedlists) and returns a sorted combination at O(n)
     def merge(self, data1, data2):
@@ -88,28 +95,31 @@ class sortedlist:
         else:
             return True
     
-	#returns an arbitrary index that contains the value at O(log(n))
+    #returns an arbitrary index that contains the value, at O(log(n))
-	#returns -1 if the list doesn't contain the value
+    def index(self, value):
-	def index(self, val):
+        low = 0
-		ind = self.indexhelper(self.data, val)
+        high = len(self)
-		if ind == len(self):
+        mid = (low + high) / 2
-			ind = -1
+        while self[mid] != value:
-		return ind
+            if self[mid] > value:
-		pass
+                high = mid
-	
-	#at this point I think I'm just bad at defining recursive functions
-	def indexhelper(self, dat, val):
-		ind = int(len(dat)/2)
-		
-		if len(dat) == 0:
-			return 0
-		elif dat[ind] == val:
-			return ind
-		elif dat[ind] < val:
-			return ind + 1 + self.indexhelper(dat[ind+1:], val)
             else:
-			return self.indexhelper(dat[:ind], val)
+                low = mid
+            mid = (high + low) / 2
+            if high in (low, low+1):
+                raise ValueError('sortedlist does not contain entry')
+        return mid
     
-	#TODO: add functionality for single=False
+    #removes a single instance of entry, raises exception if it doesn't exist
-	def remove(self, entry, single=True):
+    def remove(self, entry):
         del(self[self.index(entry)])
+    
+    #removes every instance of entry, doesn't raise an exception if it doesn't exist
+    #TODO: index once, then search adacent indices
+    def removeall(self, entry):
+        while True:
+            try:
+                del(self[self.index(entry)])
+            except ValueError:
+                break
+