Added merge sort and fixed small issue with Unsort and Randmize clashing

Author: dylan306

__pycache__/algorithms.cpython-313.pyc

@@ -1,3 +1,4 @@
+#Bubble Sort Function
 def bubble_sort(array):
     n = len(array)
     for i in range(n):
@@ -6,6 +7,7 @@ def bubble_sort(array):
                 array[j], array[j+1] = array[j+1], array[j]
                 yield array, j, j+1
 
+#Selection Sort Function
 def selection_sort(array):
     n = len(array)
     for i in range(n):
@@ -19,3 +21,50 @@ def selection_sort(array):
             array[i], array[min_idx] = array[min_idx], array[i]
             # Pause after the swap
             yield array, i, min_idx
+
+
+#Merge Sort Functions
+def merge(arr, left, mid, right):
+    merged = []
+    i, j = left, mid + 1
+
+    #Merge two already-sorted halves
+    while i <= mid and j <= right:
+        yield arr, i, j
+
+        if arr[i] < arr[j]:
+            merged.append(arr[i])
+            i += 1
+        else:
+            merged.append(arr[j])
+            j += 1
+
+    #Add the remainders
+    while i <= mid:
+        yield arr, i, i
+        merged.append(arr[i])
+        i += 1
+
+    while j <= right:
+        yield arr, j, j
+        merged.append(arr[j])
+        j += 1
+
+    #Copy the now merged list back to an array
+    for k, val in enumerate(merged):
+        arr[left + k] = val
+        yield arr, left + k, left + k
+
+def merge_sort(arr, left, right):
+    if right - left <= 0:
+        return
+    mid = (left + right) // 2
+
+    #Sorts the left halve
+    yield from merge_sort(arr, left, mid)
+
+    #Sorts the right halve
+    yield from merge_sort(arr, mid + 1, right)
+
+    #Merge the halves
+    yield from merge(arr, left, mid, right)

algorithms.py

@@ -1,4 +1,4 @@
-from algorithms import bubble_sort, selection_sort
+from algorithms import bubble_sort, selection_sort, merge, merge_sort
 import tkinter as tk
 import random
 
@@ -43,12 +43,21 @@ def start_selection_sort():
         color_array[i] = 'blue'
         color_array[j] = 'blue'
 
+#Function to Start Sorting using Merge Sort
+def start_merge_sort():
+    global array
+    for arr, i, j in merge_sort(array, 0, len(array) - 1):
+        color_array = ["blue"] * len(array)
+        color_array[i] = "red"
+        color_array[j] = "red"
+        draw_array(arr, color_array)
+
 #Randomized Array
 array = [random.randint(10, 100) for _ in range(50)]
 saved_array = array.copy()
 
 def randomize_array():
-    global array, color_array
+    global array, color_array, saved_array
     array = [random.randint(10, 100) for _ in range(50)]  # Generate new random values
     color_array = ['blue' for _ in range(len(array))]      # Reset colors
     draw_array(array, color_array)                         # Replot the array
@@ -77,6 +86,10 @@ def unsort_array():
 start_selection_button = tk.Button(button_frame, text="Start Selection Sort", command=start_selection_sort)
 start_selection_button.pack(side=tk.LEFT, padx=5)
 
+#'Start Selection Sort' Button
+start_merge_button = tk.Button(button_frame, text="Start Merge Sort", command=start_merge_sort)
+start_merge_button.pack(side=tk.LEFT, padx=5)
+
 #'Unsort' Button
 unsort_button = tk.Button(button_frame, text="Unsort", command=unsort_array)
 unsort_button.pack(side=tk.LEFT, padx=5)