fix sm

lambdaplus · lambdaplus · commit 112beef16931 · 2017-03-22T11:26:45.000+08:00
diff --git a/Algorithm/sort/merge/merge-sort.py b/Algorithm/sort/merge/merge-sort.py
@@ -10,17 +10,12 @@ def merge(left, right):
         merged = []
 
         while left and right:
-            merged.append(left.pop(0) if left[0] <= right[0] else right.pop(0))
+            merged.append(left.pop(0) if left[0] <= right[0]
+                          else right.pop(0))
 
-        while left:
-            merged.append(left.pop(0))
+        return merged + (left or right)
 
-        while right:
-            merged.append(right.pop(0))
-
-        return merged
-
-    mid = int(len(L) / 2)
+    mid = len(L) // 2
     left = merge_sort(L[:mid])
     right = merge_sort(L[mid:])
     return merge(left, right)
diff --git a/Algorithm/sort/merge/merge-sort1.py b/Algorithm/sort/merge/merge-sort1.py
@@ -7,17 +7,17 @@
 
 merge(*iterables, key=None, reverse=False)
     Merge multiple sorted inputs into a single sorted output.
-    
+
     Similar to sorted(itertools.chain(*iterables)) but returns a generator,
     does not pull the data into memory all at once, and assumes that each of
     the input streams is already sorted (smallest to largest).
-    
+
     >>> list(merge([1,3,5,7], [0,2,4,8], [5,10,15,20], [], [25]))
     [0, 1, 2, 3, 4, 5, 5, 7, 8, 10, 15, 20, 25]
-    
+
     If *key* is not None, applies a key function to each element to determine
     its sort order.
-    
+
     >>> list(merge(['dog', 'horse'], ['cat', 'fish', 'kangaroo'], key=len))
     ['dog', 'cat', 'fish', 'horse', 'kangaroo']
 '''
@@ -27,7 +27,7 @@ def merge_sort(L):
     if len(L) < 2:
         return L
 
-    mid = int(len(L) / 2)
+    mid = len(L) // 2
     left = merge_sort(L[:mid])
     right = merge_sort(L[mid:])
     return list(merge(left, right))
diff --git a/Algorithm/sort/merge/merge-sort2.py b/Algorithm/sort/merge/merge-sort2.py
@@ -1,4 +1,5 @@
 # coding=utf-8
+# 性能更好
 from random import randrange
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# coding=utf-8`
	`2`	`+# 性能更好`
`2`	`3`	`from random import randrange`
`3`	`4`
`4`	`5`