Merge branch 'sortingHeap' of https://git.ccom.uprrp.edu/CCOM4030/JeLuOrRi into sortingFinal

heap.py

+''' Luis Andrés López Mañán
+    Program written by hand as a draft on 09/19/2022
+    Credit goes to GeeksForGeeks
+    Link: https://www.geeksforgeeks.org/python-program-for-heap-sort/
+    Last access on 09/19/2022
+    Program wrriten and edited on 10/10/2022
+'''
+
+# This function heapifies a subtree rooted at an index
+# 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
+
+		# left child of root
+		left = 2 * i + 1
+
+		# right child of root
+		right = 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 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
+		lista[i], lista[largest] = lista[largest], lista[i]
+
+		# This heapifies the root repeatedly
+		heapify(lista, n, largest)

sorting.py

 Este programa calcula el promedio de tiempo de ejecucion de cuatro algoritmos de ordenamiento
 La variable maxValor define el valor maximo de los elementos de la lista
 La variable largoLista define el largo de las listas a ordenar
+<<<<<<< HEAD
 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
+>>>>>>> a2416a1f1584bddc699e3c6dfe5efdd25f2ac172
 Al final se imprimen los promedios de cada algortimo
 """
 from random import randint
 import time
+<<<<<<< HEAD
 from merge import merge
+=======
+from heap import heap
+>>>>>>> a2416a1f1584bddc699e3c6dfe5efdd25f2ac172
 
 # Python program for implementation of MergeSort
 
 # First subarray is arr[l..m]
 # Second subarray is arr[m+1..r]
 
+<<<<<<< HEAD
 def mergeSort(lista, l, r):
 	if l < r:
 
 
 def heapSort(lista):
 	#definan el algoritmo de ordenamiento heapsort
+=======
+def mergeSort(lista):
+	# definan el algoritmo de ordenamiento mergesort
+	return lista
+
+def heapSort(lista):
+	
+	n = len(lista)
+	h1 = (n // 2) - 1
+	for i in range(h1, -1, -1):
+		heapify(lista, n, i)
+
+	for i in range(h1, -1, -1):
+		lista[i], lista[0] = lista[0], lista[i]
+		heapify(lista, i, 0)
+
+>>>>>>> a2416a1f1584bddc699e3c6dfe5efdd25f2ac172
 	return lista
 
 def quickSort(lista):
 print ("HeapSort " + str(acumulaHeap/veces) + " segundos")
 print ("QuickSort " + str(acumulaQuick/veces) + " segundos")
 print ("ShellSort " + str(acumulaShell/veces) + " segundos")
+<<<<<<< HEAD
 
+=======
+>>>>>>> a2416a1f1584bddc699e3c6dfe5efdd25f2ac172