Color-coding operations

src/main/java/io/github/arrayv/main/ArrayVisualizer.java

@@ -664,6 +664,8 @@ public void refreshSorts() {
     private void drawStats(Color textColor, boolean dropShadow) {
         int xOffset = 15;
         int yOffset = 30;
+        int drawingFirstStat = 1;
+
         if (dropShadow) {
             xOffset += 3;
             yOffset += 3;
@@ -674,14 +676,13 @@ private void drawStats(Color textColor, boolean dropShadow) {
 
         this.mainRender.setColor(textColor);
 
-        statLoop:
         for (StatisticType statType : statsConfig) {
             // System.out.println(yPos);
             String stat;
             switch (statType) {
                 case LINE_BREAK:
                     yPos += (int)(fontSelectionScale / 25.0 * 15);
-                    continue statLoop;
+                    continue;
                 case SORT_IDENTITY:
                     stat = statSnapshot.getSortIdentity();
                     break;
@@ -725,6 +726,34 @@ private void drawStats(Color textColor, boolean dropShadow) {
                     stat = null; // Unreachable
             }
             mainRender.drawString(stat, xOffset, (int)(windowRatio * yPos) + yOffset);
+
+            if (drawingFirstStat == 1 && Highlights.getDeclaredColors().size() > 0) {
+                int startOffset = currentWidth(), metricFontHeight = mainRender.getFontMetrics().getHeight(),
+                    startStat = mainRender.getFontMetrics().stringWidth(stat) + xOffset + 24,
+                    copyYPos = (int)(windowRatio * yPos) + yOffset, textWidth;
+
+                for (String color : Highlights.getDeclaredColors()) {
+                    textWidth = mainRender.getFontMetrics().stringWidth(color);
+                    startOffset -= textWidth + metricFontHeight + 20;
+                    if (startOffset <= startStat) {
+                        startOffset = currentWidth() - textWidth - metricFontHeight - 20;
+                        copyYPos += metricFontHeight + 8;
+                    }
+
+                    if (!dropShadow) {
+                        mainRender.setColor(Highlights.getColorFromName(color));
+                    }
+
+                    mainRender.fillRect(startOffset, copyYPos - metricFontHeight + (metricFontHeight / 3), metricFontHeight, metricFontHeight);
+
+                    if (!dropShadow) {
+                        mainRender.setColor(textColor);
+                    }
+
+                    mainRender.drawString(color, startOffset + metricFontHeight + 6, copyYPos);
+                }
+            }
+            drawingFirstStat = 0;
             yPos += fontSelectionScale;
         }
     }
@@ -1296,7 +1325,11 @@ public String formatTimes() {
 
     public void endSort() {
         this.Timer.disableRealTimer();
+
         this.Highlights.clearAllMarks();
+        this.Highlights.clearAllColorsReferenced();
+        this.Highlights.clearColorList();
+
         System.out.println(formatTimes());
 
         this.isCanceled = false;

src/main/java/io/github/arrayv/sorts/merge/BlockSwapMergeSort.java

@@ -1,5 +1,7 @@
 package io.github.arrayv.sorts.merge;
 
+import java.awt.Color;
+
 import io.github.arrayv.main.ArrayVisualizer;
 import io.github.arrayv.sorts.templates.Sort;
 
@@ -46,14 +48,20 @@ public BlockSwapMergeSort(ArrayVisualizer arrayVisualizer) {
     }
 
     private void multiSwap(int[] array, int a, int b, int len) {
-        for(int i = 0; i < len; i++)
+        for(int i = 0; i < len; i++) {
+        	Highlights.colorCode("blockswap", a+i, b+i);
             Writes.swap(array, a+i, b+i, 1, true, false);
+        }
     }
 
     private int binarySearchMid(int[] array, int start, int mid, int end) {
         int a = 0, b = Math.min(mid-start, end-mid), m = a+(b-a)/2;
 
         while(b > a) {
+        	Highlights.colorCode("double_binsearch", mid-m-1, mid+m);
+        	Highlights.markArray(1, mid-m-1);
+        	Highlights.markArray(2, mid+m);
+        	Delays.sleep(2.5);
             if(Reads.compareValues(array[mid-m-1], array[mid+m]) == 1)
                 a = m+1;
             else
@@ -80,6 +88,9 @@ public void multiSwapMerge(int[] array, int start, int mid, int end) {
     }
 
     public void multiSwapMergeSort(int[] array, int a, int b) {
+		Highlights.retainColorMarks(true);;
+		Highlights.defineColor("double_binsearch", new Color(128, 0, 255));
+		Highlights.defineColor("blockswap", Color.ORANGE);
         int len = b-a, i;
 
         for(int j = 1; j < len; j *= 2) {

src/main/java/io/github/arrayv/sorts/merge/RotateMergeSort.java

@@ -1,5 +1,7 @@
 package io.github.arrayv.sorts.merge;
 
+import java.awt.Color;
+
 import io.github.arrayv.main.ArrayVisualizer;
 import io.github.arrayv.sorts.templates.Sort;
 
@@ -45,8 +47,10 @@ public RotateMergeSort(ArrayVisualizer arrayVisualizer) {
     }
 
     private void multiSwap(int[] array, int a, int b, int len) {
-		for(int i = 0; i < len; i++)
+		for(int i = 0; i < len; i++) {
+			Highlights.colorCode("rotate", a+i, b+i);
 			Writes.swap(array, a+i, b+i, 1, true, false);
+		}
 	}
 
     private void rotate(int[] array, int a, int m, int b) {
@@ -71,7 +75,9 @@ private void rotate(int[] array, int a, int m, int b) {
 	private int binarySearch(int[] array, int a, int b, int value, boolean left) {
 		while(a < b) {
 			int m = a+(b-a)/2;
-
+			Highlights.colorCode(m, "binsearch");
+        	Highlights.markArray(1, m);
+        	Delays.sleep(2.5);
 			boolean comp = left ? Reads.compareValues(value, array[m]) <= 0
 								: Reads.compareValues(value, array[m]) < 0;
 
@@ -102,6 +108,9 @@ private void rotateMerge(int[] array, int a, int m, int b) {
 	}
 
 	protected void rotateMergeSort(int[] array, int a, int b) {
+		Highlights.retainColorMarks(true);
+		Highlights.defineColor("binsearch", Color.CYAN);
+		Highlights.defineColor("rotate", Color.ORANGE);
         int len = b-a, i;
 
         for(int j = 1; j < len; j *= 2) {

src/main/java/io/github/arrayv/sorts/select/CycleSort.java

@@ -1,5 +1,7 @@
 package io.github.arrayv.sorts.select;
 
+import java.awt.Color;
+
 import io.github.arrayv.main.ArrayVisualizer;
 import io.github.arrayv.sorts.templates.Sort;
 
@@ -51,15 +53,19 @@ private int countLesser(int[] array, int a, int b, int t) {
 			Highlights.markArray(1, r);
 			Highlights.markArray(2, i);
 			Delays.sleep(0.01);
-
-			r += Reads.compareValues(array[i], t) < 0 ? 1 : 0;
+			int cmp = Reads.compareIndexValue(array, i, t, 0.05, true) < 0 ? 1 : 0;
+			if(cmp == 1) {
+				Highlights.colorCode(i, "lower_rank");
+			}
+			r += cmp;
 		}
 		Highlights.clearMark(2);
 		return r;
 	}
 
     @Override
     public void runSort(int[] array, int length, int bucketCount) {
+    	Highlights.defineColor("lower_rank", Color.GREEN);
 		for(int i = 0; i < length-1; i++) {
 			Highlights.markArray(3, i);
 
@@ -72,11 +78,14 @@ public void runSort(int[] array, int length, int bucketCount) {
 
 					int t1 = array[r];
 					Writes.write(array, r, t, 0.02, false, false);
+
+					Highlights.clearAllColors();
 					t = t1;
-
+					
 					r = this.countLesser(array, i, length, t);
 				}
 				while(r != i);
+				Highlights.clearAllColors();
 
 				Writes.write(array, i, t, 0.02, false, false);
 			}