sorting.py

@@ -25,27 +25,26 @@ def mergeSort(lista):
                 j = 0
                 k = 0
 
-        while i < len(L) and j < len(R):
-                if L[i] <= R[j]:
+                while i < len(L) and j < len(R):
+                        if L[i] <= R[j]:
+                                lista[k] = L[i]
+                                i += 1
+                        else:
+                                lista[k] = R[j]
+                                j += 1
+                        k += 1
+
+                while i < len(L):
                         lista[k] = L[i]
                         i += 1
-                else:
+                        k += 1
+
+                while j < len(R):
                         lista[k] = R[j]
                         j += 1
-                k += 1
-
-        while i < len(L):
-                lista[k] = L[i]
-                i += 1
-                k += 1
-
-        while j < len(R):
-                lista[k] = R[j]
-                j += 1
-                k += 1
+                        k += 1
 
         return lista
-
 def heapSort(lista):
 	#definan el algoritmo de ordenamiento heapsort
 	"""