Merge branch 'heapSort' into sortingFinal

attempt?
??????

sorting.py

@@ -58,7 +58,43 @@ def mergeSort(lista):
 
 def heapSort(lista):
 	#definan el algoritmo de ordenamiento heapsort
-	return lista
+    #Andrea V. Nieves
+    
+    
+    #function def
+    def heapify(lista, n, i):
+       biggest = i
+       left = 2*i + 1
+       right = 2*i + 2
+       
+       
+       if left < n and lista[left] > lista[i]:
+           biggest = left
+       else:
+            biggest = i
+            
+       if right< n and lista[right] > lista[biggest]:
+           biggest = right
+           
+       if biggest != i:
+           lista[i], lista[biggest] = lista[biggest], lista[i]
+           heapify(lista,n,biggest)
+    
+    
+   
+    
+       #actual call
+    n = len(lista)
+    
+    for i in range(n // 2 - 1, -1, -1):
+        heapify(lista, n, i)
+        
+    for i in range(n - 1, 0, -1):
+        lista[i], lista[0] = lista[0], lista[i]
+        heapify(lista, i, 0)
+        
+    
+    return lista
 
 def quickSort(lista):
 	#definan el algoritmo de ordenamiento quicksort