improved visualization and algs

Author: andreidumitrescu95

Algorithms/__pycache__/bubble_sort.cpython-38.pyc

@@ -1,30 +1,42 @@
 from Display.display import update_display
+from Helper.global_variables import *
+import winsound
+import math
 
 def bubble_sort_swap(index, height, numswaps):
-    
+
     aux = height[index]
     height[index] = height[index+1]
     height[index+1] = aux
     numswaps = numswaps + 1
-    return numswaps   
+    return numswaps  
 
-def bubble_sort(win, height, numswaps, algorithm, number_of_elements, speed):
+def bubble_sort(win, height, color_height, numswaps, algorithm, number_of_elements, speed):
 
     swap_occurred = 0;
+    n = len(height)
 
-    for i in range(len(height)-1):
-
-        for j in range(len(height)-1):
+    for i in range(n-1):
 
-            if(height[i] > height[i+1]):
+        for j in range(0, n-i-1):
+            
+            color_height[j] = GREEN
+            color_height[j+1] = GREEN
+            update_display(win, height, color_height, numswaps, algorithm, number_of_elements, speed, 0, True)
 
-                swap_occurred = 1;
+            if(height[j] > height[j+1]):
 
-                numswaps = bubble_sort_swap(i, height, numswaps) 
-                update_display(win, height, numswaps, algorithm, number_of_elements, speed, 0)           
-                #update_display()                    
+                color_height[j] = RED
+                color_height[j+1] = RED
+                numswaps = bubble_sort_swap(j, height, numswaps) 
+                freq = height[j] - height[j+1]
+                #winsound.Beep(abs(freq)*10 + 37, 50)
+                update_display(win, height, color_height, numswaps, algorithm, number_of_elements, speed, 0, True)
+
+            color_height[j] = TURQUOISE
+            color_height[j+1] = TURQUOISE
+        color_height[j+1] = PURPLE
 
-    if(swap_occurred == 1):
-        bubble_sort(win, height, numswaps, algorithm, number_of_elements, speed)
+    color_height[0] = PURPLE
 
     return numswaps

Algorithms/__pycache__/container.cpython-38.pyc

@@ -1,19 +1,28 @@
 from Display.display import update_display
+from Helper.global_variables import *
 
-def insertion_sort(win, height, numswaps, algorithm, number_of_elements, speed): 
+def insertion_sort(win, height, color_height, numswaps, algorithm, number_of_elements, speed): 
 
     # Traverse through 1 to len(height) 
     for i in range(1, len(height)): 
 
         key = height[i] 
+        #color_height[i] = GREEN
 
         # Move elements of height[0..i-1], that are 
         # greater than key, to one position ahead 
         # of their current position 
         j = i-1
         while j >= 0 and key < height[j] : 
+                color_height[i] = GREEN
                 height[j + 1] = height[j] 
                 j -= 1
                 numswaps = numswaps + 1
-                update_display(win, height, numswaps, algorithm, number_of_elements, speed, 0)
-        height[j + 1] = key 
+                color_height[j+1] = RED
+                color_height[j] = RED
+                update_display(win, height, color_height, numswaps, algorithm, number_of_elements, speed, 0, True)
+                color_height[j+1] = TURQUOISE
+                color_height[j] = TURQUOISE
+        height[j + 1] = key 
+
+    return numswaps

Algorithms/__pycache__/insertion_sort.cpython-38.pyc

@@ -1,4 +1,5 @@
 from Display.display import update_display
+from Helper.global_variables import *
 
 def selection_sort_swap(index1, index2, height, numswaps):
 
@@ -12,17 +13,31 @@ def selection_sort_swap(index1, index2, height, numswaps):
     #else:
     #    winsound.Beep(int(height[index2]/height[index1])*100, 100)
 
-def selection_sort(win, height, numswaps, algorithm, number_of_elements, speed):
+def selection_sort(win, height, color_height, numswaps, algorithm, number_of_elements, speed):
 
     for i in range(0, len(height) -1):
 
         min = i
 
+        color_height[i] = GREEN
         for j in range(i+1, len(height)):
 
+            #color_height[j] = GREEN
+            #color_height[min] = GREEN
+            #update_display(win, height, color_height, numswaps, algorithm, number_of_elements, speed, 0, True)
+
             if(height[j] < height[min]):
 
+                color_height[j] = RED
+                #color_height[min] = RED
                 min = j
 
-        numswaps = selection_sort_swap(min, i, height, numswaps)        
-        update_display(win, height, numswaps, algorithm, number_of_elements, speed, 0)
+        numswaps = selection_sort_swap(min, i, height, numswaps)      
+        update_display(win, height, color_height, numswaps, algorithm, number_of_elements, speed, 0, True)
+
+        for k in range(0, i+1):
+            color_height[k] = PURPLE
+        
+    color_height[len(height)-1] = PURPLE
+
+    return numswaps

Algorithms/__pycache__/selection_sort.cpython-38.pyc

@@ -4,12 +4,12 @@
 
 pygame.init()
 
-def update_display(win, height, numswaps, algorithm, number_of_elements, speed, time):
+def update_display(win, height, color_height, numswaps, algorithm, number_of_elements, speed, time, running):
 
     win.fill(BLACK) 
 
     # call show method to display the list items 
-    show(win, height, number_of_elements) 
+    show(win, height, color_height, number_of_elements) 
 
     for i in range(15):
         pygame.draw.line(win, TURQUOISE, (0, 165+i), (WIDTH, 165+i))
@@ -43,34 +43,30 @@ def update_display(win, height, numswaps, algorithm, number_of_elements, speed,
     button_instant.draw(win)
 
     # create a time delay 
-    delay = 0
-    if(speed == "Slow"):
-        delay = 50
-    if(speed == "Medium"):
-        delay = 25
-    if(speed == "Fast"):
-        delay = 10
-    if(speed == "No delay"):
+    if(running == True):
         delay = 0
-    pygame.time.delay(delay) 
+        if(speed == "Slow"):
+            delay = 1000
+        if(speed == "Medium"):
+            delay = 50
+        if(speed == "Fast"):
+            delay = 25
+        if(speed == "No delay"):
+            delay = 1
+        pygame.time.delay(delay)
 
     # update the display 
     pygame.display.update() 
 
 # method to show the list of height 
-def show(win, height, number_of_elements): 
-      
+def show(win, height, color_height, number_of_elements): 
+    
     if(number_of_elements != -1 and len(height) != 0):
 
         maximum_value = max(height)
         step = (WIDTH/len(height))
 
         for i in range(len(height)): 
-    
-            x = Button(step * (i+1), HEIGHT, -(step-10), -(height[i]/maximum_value)*3*HEIGHT/4, BLACK, TURQUOISE, str(height[i]), int(round(step - 20)))
-            x.draw(win)
-            #font = pygame.font.SysFont('Arial', int(round(step - 13)))
-            #text = font.render(str(height[i]), False, (255, 0, 0))
-            #rectangle = pygame.draw.rect(win, (255, 255, 0), (step * (i+1), HEIGHT, -(step-10), -(height[i]/maximum_value)*3*HEIGHT/4)) 
-            #text_rect = text.get_rect(center=(step * (i+1) - (step-10)/2, HEIGHT - 10))
-            #win.blit(text, text_rect)
+            
+            x = Button(step * (i+1), HEIGHT, -(step), -(height[i]/maximum_value)*3*HEIGHT/4, BLACK, color_height[i], str(height[i]), int(round(step - 20)))
+            x.draw(win)