more consistent highlights

Author: amari-calipso

SortingVisualizer.opal

@@ -16,7 +16,7 @@ new float UNIT_SAMPLE_DURATION = 1.0 / 30.0,
           N_OVER_R             = NATIVE_FRAMERATE / RENDER_FRAMERATE,
           R_OVER_N             = RENDER_FRAMERATE / NATIVE_FRAMERATE;
 
-new str VERSION = "2024.5.5";
+new str VERSION = "2024.5.7";
 
 import math, random, time, os, numpy, sys, 
        pygame_gui, json, subprocess, shutil,
@@ -1192,7 +1192,10 @@ new class SortingVisualizer {
 
         while running {
             time.sleep(0.005); # this fixes some freezing issues (???)
-            this.multiHighlightAdvanced([]);
+
+            with this.highlightsLock {
+                this.multiHighlightAdvanced([]);
+            }
         }
 
         t.join();

threads/runAllSorts.opal

@@ -99,13 +99,13 @@ runAllSort(1024, "Weak Heap Sort",   5);
 
 
 ct = "Concurrent Sorts";
-runAllSort(1024, "Bose Nelson",                7);
-runAllSort(2048, "Bose Nelson (Parallel)",  0.05);
-runAllSort(1024, "Fold Sort",                  7);
-runAllSort(1024, "Bitonic Sort",               5);
-runAllSort(2048, "Bitonic Sort (Parallel)", 0.05);
-runAllSort(1024, "Pairwise",                   5);
-runAllSort(1024, "Odd Even Merge",             5);
+runAllSort(1024, "Bose Nelson",             7);
+runAllSort(2048, "Bose Nelson (Parallel)",  1);
+runAllSort(1024, "Fold Sort",               7);
+runAllSort(1024, "Bitonic Sort",            5);
+runAllSort(2048, "Bitonic Sort (Parallel)", 1);
+runAllSort(1024, "Pairwise",                5);
+runAllSort(1024, "Odd Even Merge",          5);
 
 
 ct = "Quick Sorts";
@@ -136,31 +136,31 @@ new dict firstKillers = {
     "Perlin Noise": ["Sorted"]
 };
 
-runAllSort(1024, "LL Quick Sort",              4, pivotSelections.index("First"),  firstKillers);
-runAllSort(1024, "LL Quick Sort (Parallel)", 0.5, pivotSelections.index("First"),  firstKillers);
-runAllSort(1024, "LR Quick Sort",              4, pivotSelections.index("Middle"), centerKillers);
-runAllSort(1024, "LR Quick Sort (Parallel)", 0.5, pivotSelections.index("Middle"), centerKillers);
+runAllSort(1024, "LL Quick Sort",            4, pivotSelections.index("First"),  firstKillers);
+runAllSort(1024, "LL Quick Sort (Parallel)", 4, pivotSelections.index("First"),  firstKillers);
+runAllSort(1024, "LR Quick Sort",            4, pivotSelections.index("Middle"), centerKillers);
+runAllSort(1024, "LR Quick Sort (Parallel)", 4, pivotSelections.index("Middle"), centerKillers);
 centerKillers["Linear"].remove("Reversed Sawtooth");
-runAllSort(1024, "Stackless Quick",            4, pivotSelections.index("Median of three (unstable)"), centerKillers);
-runAllSort(1024, "Dual Pivot Quick",           4, killers = centerKillers);
-runAllSort(2048, "Median-Of-16 A. Quick",     10);
-runAllSort(2048, "PDQ Sort",                  10); 
-runAllSort(1024, "Aeos Quick",                 3);
-runAllSort(1024, "Log Sort",                   3, 0);
+runAllSort(1024, "Stackless Quick",          4, pivotSelections.index("Median of three (unstable)"), centerKillers);
+runAllSort(1024, "Dual Pivot Quick",         4, killers = centerKillers);
+runAllSort(2048, "Median-Of-16 A. Quick",   10);
+runAllSort(2048, "PDQ Sort",                10); 
+runAllSort(1024, "Aeos Quick",               3);
+runAllSort(1024, "Log Sort",                 3, 0);
 
 
 ct = "Merge Sorts";
-runAllSort(1024, "Merge Sort",                 8);
-runAllSort(2048, "Merge Sort (Parallel)",      1);
-runAllSort(1024, "Bottom Up Merge",            4);
-runAllSort(256,  "Lazy Stable",                4, rotations.index("Gries-Mills"));
-runAllSort(1024, "Rotate Merge",               3, rotations.index("Gries-Mills"));
-runAllSort(2048, "Rotate Merge (Parallel)", 0.25, rotations.index("Gries-Mills"));
-runAllSort(1024, "Adaptive Rotate Merge",      5, 128);
-runAllSort(1024, "Uranium Sort",               2);
-runAllSort(1024, "Tim Sort",                   5);
-runAllSort(2048, "Andrey's Merge",             8);
-runAllSort(2048, "Buf Merge 2",                3, rotations.index("Helium"));
+runAllSort(1024, "Merge Sort",              8);
+runAllSort(2048, "Merge Sort (Parallel)",   2);
+runAllSort(1024, "Bottom Up Merge",         4);
+runAllSort(256,  "Lazy Stable",             4, rotations.index("Gries-Mills"));
+runAllSort(1024, "Rotate Merge",            3, rotations.index("Gries-Mills"));
+runAllSort(2048, "Rotate Merge (Parallel)", 1, rotations.index("Gries-Mills"));
+runAllSort(1024, "Adaptive Rotate Merge",   5, 128);
+runAllSort(1024, "Uranium Sort",            2);
+runAllSort(1024, "Tim Sort",                5);
+runAllSort(2048, "Andrey's Merge",          8);
+runAllSort(2048, "Buf Merge 2",             3, rotations.index("Helium"));
 
 
 ct = "Block Merge Sorts";