Modified sorting.py and heap.py

heap.py

@@ -12,27 +12,26 @@
 # i. Also, n is the size of a heap and arr is array.
 
 def heapify(lista, n, i):
-		# largest is root for now
-		largest = i
+    # largest is root for now
+	largest = i
 
-		# left child of root
-		left = 2 * i + 1
+	# left child of root
+	l = 2 * i + 1
 
-		# right child of root
-		right = 2 * i + 2
+	# right child of root
+	r = 2 * i + 2
 
-		# Checks if root has a left child and is greater
-		# than root
-		if l < n and lista[i] < lista[l] :
-			largest = l
+	# Checks if root has a left child and is greater
+	# than root
+	if l < n and lista[i] < lista[l] :
+		largest = l
 
-		# Checks if root has a right child and is greater
-		# than root
-		if r < n and lista[largest] < lista[r]:
-			largest = r
+	# Checks if root has a right child and is greater
+	# than root
+	if r < n and lista[largest] < lista[r]:
+		largest = r
 
-		# If necessary, this changes root by swapping va-
-		# lues
+	# If necessary, this changes root by swapping values, then heapifies
 		lista[i], lista[largest] = lista[largest], lista[i]
 
 		heapify(lista, n, largest)

sorting.py

@@ -6,20 +6,13 @@ La variable largoLista define el largo de las listas a ordenar
 La variable veces define las veces que se va a hacer el ordenamiento
 La variable veces define las veces que se va a hacer el ordenamiento
 Al final se imprimen los promedios de cada algortimo
-<<<<<<< HEAD
 '''
 
-=======
-"""
->>>>>>> sortingHeap
 import time
 from random import randint
 
 import heap
-<<<<<<< HEAD
 from merge import merge
-=======
->>>>>>> sortingHeap
 
 # Python program for implementation of MergeSort
 
@@ -28,7 +21,6 @@ from merge import merge
 # Second subarray is arr[m+1..r]
 
 def mergeSort(lista, l, r):
-<<<<<<< HEAD
 	if l < r:
       # Same as (l+r)//2, but avoids overflow for
       # large l and h
@@ -47,10 +39,6 @@ def mergeSort(lista, l, r):
 '''
 
 # Python program for implementation of heap Sort (Part II)
-=======
-	# definan el algoritmo de ordenamiento mergesort
-	return lista
->>>>>>> sortingHeap
 
 def heapSort(lista):
 	# Se busca el tamaño de la lista
@@ -64,7 +52,6 @@ def heapSort(lista):
 	h1 = (n // 2) - 1
 	for i in range(h1, -1, -1):
 		heap.heapify(lista, n, i)
-<<<<<<< HEAD
   
 	# Se extrae los elementos uno a uno
 	h2 = n - 1
@@ -73,14 +60,6 @@ def heapSort(lista):
 		lista[i], lista[0] = lista[0], lista[i]
 		heap.heapify(lista, 0, i)
   
-=======
-
-	h2 = n - 1
-	for i in range(h2, 0, -1):
-		lista[i], lista[0] = lista[0], lista[i]
-		heap.heapify(lista, 0, i)
-
->>>>>>> sortingHeap
 	return lista
 
 def quickSort(lista):