fixed sorting tests

Author: aladdinpersson

Algorithm_tests/sorting_tests/test_sorting.py

@@ -12,7 +12,7 @@
 from bubblesort import bubblesort
 from insertionsort import insertionsort
 from mergesort import merge_sort, merge
-from quicksort import quicksort_firstpivot
+from quicksort import quicksort_firstpivot, quicksort_lastpivot
 from randomized_quicksort import quicksort_randomized
 from selectionsort import selectionsort
 
@@ -77,6 +77,16 @@ def test_quicksort(self):
         self.assertEqual(quicksort_firstpivot(L6), L6_sorted)
         self.assertEqual(quicksort_firstpivot(L7), L7_sorted)
 
+        self.assertEqual(quicksort_lastpivot(L1), L1_sorted)
+        self.assertEqual(quicksort_lastpivot(L2), L2_sorted)
+        self.assertEqual(quicksort_lastpivot(L3), L3_sorted)
+        self.assertEqual(quicksort_lastpivot(L4), L4_sorted)
+        self.assertEqual(quicksort_lastpivot(L5), L5_sorted)
+        self.assertEqual(quicksort_lastpivot(L6), L6_sorted)
+        self.assertEqual(quicksort_lastpivot(L7), L7_sorted)
+
+
+
     def test_selectionsort(self):
         self.assertEqual(selectionsort(L1), L1_sorted)
         self.assertEqual(selectionsort(L2), L2_sorted)

Algorithms/sorting/quicksort.py

@@ -51,59 +51,4 @@ def quicksort_lastpivot(x):
     left.append(x[i])
 
     result = left + right
-    return result
-
-def find_median(x):
-    # this is horrible.
-
-    if len(x) % 2 == 0:
-        middle_idx = len(x) // 2 - 1
-    if len(x) % 2 != 0:
-        middle_idx = len(x) // 2
-
-    a = x[0]
-    b = x[middle_idx]
-    c = x[-1]
-
-    if a > b:
-        if a < c:
-            median = 0
-        elif b > c:
-            median = middle_idx
-        else:
-            median = len(x) - 1
-    else:
-        if a > c:
-            median = 0
-        elif b < c:
-            median = middle_idx
-        else:
-            median = len(x) - 1
-
-    return median
-
-def quicksort_median(x):
-    global count_comparisons
-
-    if len(x) <= 1:
-        return x
-
-    k = find_median(x)
-    x[0], x[k] = x[k], x[0]
-    pivot = x[0]
-
-    count_comparisons += len(x) - 1
-
-    i = 0
-
-    for j in range(1, len(x)):
-        if x[j] < pivot:
-            x[j], x[i+1] = x[i+1], x[j]
-            i += 1
-
-    x[0], x[i] = x[i], x[0]
-    left = quicksort_median(x[:i])
-    right = quicksort_median(x[i+1:])
-    left.append(x[i])
-    result = left + right
-    return result
+    return result