Merge branch 'sortingJavier' into sortingFinal

sorting.py

@@ -19,10 +19,69 @@ Al final se imprimen los promedios de cada algortimo
 from random import randint
 import time
 
+
+#===============================
+#Modificación a código: Diego
+#Añado función heapify
+#===============================
+def heapify(listaHeap, largoLista, i):
+	largest = i
+	left = 2 * i + 1
+	right = 2 * i + 2
+
+	if left < largoLista and listaHeap[i] < listaHeap[left]:
+		largest = left
+
+	if right < largoLista and listaHeap[largest] < listaHeap[right]:
+		largest = right
+
+
+def merge(lista, p, q, r):
+	left = lista[p:q+1] # copy the left subarray
+	right = lista[q+1:r+1] # copy the right subarray
+	i = 0 # index for the left subarray
+	j = 0 # index for the right subarray
+	k = p # index for the sorted list
+
+	# Keep adding to the sorted list, while both lists have elements
+	while i < len(left) and j < len(right):
+		if left[i] <= right[j]: 
+			lista[k] = left[i]
+			i += 1
+		else:
+			lista[k] = right[j]
+			j += 1            
+
+		k += 1
+
+	# If right finished first, then fill up the rest with the left subarray
+	while i < len(left):
+		lista[k] = left[i]
+		i += 1
+		k += 1
+
+	# If left finished first, then fill up the rest with the right subarray
+	while j < len(right):
+		lista[k] = right[j]
+		j += 1
+		k += 1        
+
+
+def mergeSortAux(lista, p, r):
+	# If array has one element or less, return
+	if p >= r:
+		return 
+	# Else, split the array in half
+	q = int((p+r)/2) # find the middle
+	mergeSortAux(lista, p, q) # Sort the left subarray
+	mergeSortAux(lista, q+1, r) # Sort the right subarray
+	merge(lista, p, q, r) # Combine both subarrays 
+
+
 def mergeSort(listaMerge):
 	#definan el algoritmo de ordenamiento mergesort
-
-	return lista
+	mergeSortAux(listaMerge, 0, len(listaMerge)-1)
+	return listaMerge
 
 #===============================
 #Modificación a código: Diego