Implementation of MergeSort algorithm -Carla Ramos

sorting.py

@@ -6,12 +6,50 @@ La variable largoLista define el largo de las listas a ordenar
 La variable veces define las veces que se va a hacer el ordenamiento 
 Al final se imprimen los promedios de cada algortimo
 """
+from heapq import merge
 from random import randint
 import time
 
+
 def mergeSort(lista):
 	#definan el algoritmo de ordenamiento mergesort
-	return lista
+
+	# check if the array has more than one element
+    if len(lista) > 1:
+        # divide the array in two halves
+        middle = len(lista)//2
+        leftHalf = lista[:middle]
+        rightHalf = lista[middle:]
+        
+        mergeSort(leftHalf)
+        mergeSort(rightHalf)
+        # declare pointers
+
+        i = j = k = 0
+
+        while i < len(leftHalf) and j < len(rightHalf):
+            if leftHalf[i] < rightHalf[j]:
+                lista[k] = leftHalf[i]
+                i = i + 1
+
+            else:
+                lista[k] = rightHalf[j]
+                j = j + 1
+           
+            k = k + 1
+
+        # continue updating array grabbing any elements that were left
+        while i < len(leftHalf):
+            lista[k] = leftHalf[i]
+            i = i + 1
+            k = k + 1
+
+        while j < len(rightHalf):
+            lista[k] = rightHalf[j]
+            j = j + 1
+            k = k + 1
+
+    return lista
 
 def heapSort(lista):
 	#definan el algoritmo de ordenamiento heapsort