Merge pull request #4 from shengexing/93710

shengexing · web-flow · commit fee8069d459a · 2020-03-21T11:30:15.000+08:00
93710
diff --git a/AlgorithmDiagram9787115447630/Chapter01/c01_2_binarySearch/binarySearch.py b/AlgorithmDiagram9787115447630/Chapter01/c01_2_binarySearch/binarySearch.py
@@ -11,7 +11,7 @@ def binary_search(list, item):
         guess = list[mid]
         if guess == item:  # 找到了元素
             return mid
-        if guess > item:  # 猜的数字大了
+        elif guess > item:  # 猜的数字大了
             high = mid - 1
         else:  # 猜的数字小了
             low = mid + 1
diff --git a/AlgorithmDiagram9787115447630/Chapter04/c04_1_1_sum/maxArray.py b/AlgorithmDiagram9787115447630/Chapter04/c04_1_1_sum/maxArray.py
@@ -4,14 +4,14 @@
 # 对列表元素求最大值
 def maxArray(num):
     if num:
-        temp0 = num.pop()  # 数组不为空，取出最后一个元素
+        temp0 = num.pop()  # 列表不为空，取出最后一个元素
         if num:
             temp1 = maxArray(num)
             if temp0 < temp1:
                 return temp1
         return temp0
     else:
-        return None  # 数组为空，返回 None
+        return None  # 列表为空，返回 None
 
 
 print(maxArray([]))
diff --git a/AlgorithmDiagram9787115447630/Chapter04/c04_2_quickSort/quickSort.py b/AlgorithmDiagram9787115447630/Chapter04/c04_2_quickSort/quickSort.py
@@ -0,0 +1,22 @@
+""" 快速排序 """
+
+import random
+
+
+# 快速排序的函数
+def quickSort(array):
+    if len(array) < 2:
+        return array  # 基线条件：为空或只包含一个元素的数组是 “有序” 的
+    else:
+        index = random.randint(0, len(array) - 1)
+        return quickSort(
+            [i for i in array[0:index] + array[index+1:] if i < array[index]]
+        ) + [array[index]] + quickSort(
+            [i for i in array[0:index] + array[index+1:] if i >= array[index]]
+        )
+
+
+print(quickSort([]))
+print(quickSort([5]))
+print(quickSort([5, 3]))
+print(quickSort([5, 3, 6, 2, 10]))
