Quick sort (and add variable delay)

Author: Hopson97

src/main/java/sortVisualiser/SortArray.java

@@ -17,7 +17,7 @@
 public class SortArray extends JPanel {
     public static final int WIN_WIDTH = 1280;
     public static final int WIN_HEIGHT = 720;
-    private static final int BAR_WIDTH = 8;
+    private static final int BAR_WIDTH = 5;
     private static final int NUM_BARS = WIN_WIDTH / BAR_WIDTH;
 
     private int[] array;
@@ -41,7 +41,7 @@ public int getValue(int index) {
         return array[index];
     }
 
-    public void swapUpdate(int firstIndex, int secondIndex) {
+    public void swap(int firstIndex, int secondIndex, long milliSecDelay) {
         int temp = array[firstIndex];
         array[firstIndex] = array[secondIndex];
         array[secondIndex] = temp;
@@ -50,14 +50,28 @@ public void swapUpdate(int firstIndex, int secondIndex) {
         barColours[secondIndex] = 100;
 
         repaint();
-        sleepFor(millisecondsToNano(15));
+        sleepFor(millisecondsToNano(milliSecDelay));
     }
 
-    public void updateSingle(int index, int value) {
+    public void updateSingle(int index, int value, long millisecondDelay) {
         array[index] = value;
         barColours[index] = 100;
         repaint();
-        sleepFor(millisecondsToNano(15));
+        sleepFor(millisecondsToNano(millisecondDelay));
+    }
+    
+    public void shuffle() {
+        Random rng = new Random();
+        for (int i = 0; i < arraySize(); i++) {
+            int swapWithIndex = rng.nextInt(arraySize() - 1);
+            swap(i, swapWithIndex, 5);
+        }
+    }
+    
+    public void highlightArray() {
+        for (int i = 0; i < arraySize(); i++) {
+            swap(i, i, 5);
+        }
     }
 
     /**
@@ -87,7 +101,7 @@ public void paintComponent(Graphics g) {
 
         graphics.setColor(Color.white);
         for (int x = 0; x < NUM_BARS; x++) {
-            int height = getValue(x) * 3;
+            int height = getValue(x) * 2;
             int xBegin = x + (BAR_WIDTH - 1) * x;
             int yBegin = WIN_HEIGHT - height;
 

src/main/java/sortVisualiser/SortVisualiser.java

@@ -5,8 +5,8 @@
 import sortVisualiser.algorithms.BubbleSort;
 import sortVisualiser.algorithms.ISortAlgorithm;
 import sortVisualiser.algorithms.InsertionSort;
+import sortVisualiser.algorithms.QuickSort;
 import sortVisualiser.algorithms.SelectionSort;
-import sortVisualiser.algorithms.Shuffle;
 import static util.Sleep.secondsToNano;
 import static util.Sleep.sleepFor;
 
@@ -16,9 +16,7 @@
  */
 public class SortVisualiser {
     private JFrame window;
-    private SortArray sortArray;
-    private Shuffle shuffler = new Shuffle();
-    
+    private SortArray sortArray;  
     private ArrayList<ISortAlgorithm> sortQueue;
 
     /**
@@ -34,19 +32,14 @@ public SortVisualiser() {
         window.setVisible(true);
 
         sortQueue = new ArrayList<>();
+        sortQueue.add(new QuickSort());
         sortQueue.add(new SelectionSort());
         sortQueue.add(new InsertionSort());
         sortQueue.add(new BubbleSort());
     }
-    
-    private void highlightArray() {
-        for (int i = 0; i < sortArray.arraySize(); i++) {
-            sortArray.swapUpdate(i, i);
-        }
-    }
-    
+   
     private void shuffleAndWait() {
-        shuffler.runSort(sortArray);
+        sortArray.shuffle();
         sortArray.resetColours();
         sleepFor(secondsToNano(2));
     }
@@ -56,8 +49,9 @@ public void run() {
             sleepFor(secondsToNano(1));
             shuffleAndWait();
             algorithm.runSort(sortArray);
+            System.out.println("SORT DONE");
             sortArray.resetColours();
-            highlightArray();
+            sortArray.highlightArray();
             sortArray.resetColours();
         }
     }

src/main/java/sortVisualiser/algorithms/BubbleSort.java

@@ -14,7 +14,7 @@ public void runSort(SortArray array) {
         for(int i = 0; i < len - 1; i++) {
             for (int j = 0; j < len - i - 1; j++) {
                 if (array.getValue(j) > array.getValue(j + 1)) {
-                    array.swapUpdate(j, j + 1);
+                    array.swap(j, j + 1, 2);
                 }
             }
         }

src/main/java/sortVisualiser/algorithms/InsertionSort.java

@@ -15,10 +15,10 @@ public void runSort(SortArray array) {
             int key = array.getValue(i);
             int j = i - 1;
             while (j >= 0 && array.getValue(j) > key) {
-                array.updateSingle(j + 1, array.getValue(j));
+                array.updateSingle(j + 1, array.getValue(j), 5);
                 j--;
             }
-            array.updateSingle(j + 1, key);
+            array.updateSingle(j + 1, key, 5);
         }
     }
 

src/main/java/sortVisualiser/algorithms/QuickSort.java

@@ -0,0 +1,37 @@
+package sortVisualiser.algorithms;
+
+import sortVisualiser.SortArray;
+
+/**
+ *
+ * @author mhops
+ */
+public class QuickSort implements ISortAlgorithm
+{
+    private int findPivotPoint(SortArray array, int lowIndex, int highIndex) {
+        int pivotValue = array.getValue(highIndex);
+        int i = lowIndex - 1;
+        for (int j = lowIndex; j <= highIndex - 1; j++) {
+            if (array.getValue(j) <= pivotValue) {
+                i++;
+                array.swap(i, j, 5);
+            }
+        }
+        array.swap(i + 1, highIndex, 50);
+        return i + 1;
+    }
+    
+    private void quickSort(SortArray array, int lowIndex, int highIndex) {
+        if (lowIndex < highIndex) {
+            int pivotPoint = findPivotPoint(array, lowIndex, highIndex);
+            quickSort(array, lowIndex, pivotPoint - 1);
+            quickSort(array, pivotPoint + 1, highIndex);
+        }
+    }
+    
+    @Override
+    public void runSort(SortArray array) {
+        quickSort(array, 0, array.arraySize() - 1);
+    }
+
+}

src/main/java/sortVisualiser/algorithms/SelectionSort.java

@@ -17,7 +17,7 @@ public void runSort(SortArray array) {
                     minIndex = j;
                 }
             }
-            array.swapUpdate(i, minIndex);
+            array.swap(i, minIndex, 50);
         }
     }
 }