Chapter 04 section 10 codes updated.

Author: liuyubobobo

04-Sort-Visualization/10-Three-Ways-Quick-Sort-Visualization/src/AlgoFrame.java

@@ -32,7 +32,7 @@ public AlgoFrame(String title){
     public int getCanvasHeight(){return canvasHeight;}
 
     // data
-    ThreeWaysQuickSortData data;
+    private ThreeWaysQuickSortData data;
     public void render(ThreeWaysQuickSortData data){
         this.data = data;
         repaint();

04-Sort-Visualization/10-Three-Ways-Quick-Sort-Visualization/src/AlgoVisualizer.java

@@ -3,16 +3,15 @@
 
 public class AlgoVisualizer {
 
-    private static int DELAY = 40;
+    private static int DELAY = 20;
 
     private ThreeWaysQuickSortData data;
     private AlgoFrame frame;
 
     public AlgoVisualizer(int sceneWidth, int sceneHeight, int N, ThreeWaysQuickSortData.Type dataType){
 
         // 初始化数据
-        int randomBound = dataType == ThreeWaysQuickSortData.Type.Identical ? sceneHeight/2 : sceneHeight;
-        data = new ThreeWaysQuickSortData(N, randomBound, dataType);
+        data = new ThreeWaysQuickSortData(N, sceneHeight, dataType);
 
         // 初始化视图
         EventQueue.invokeLater(() -> {
@@ -24,13 +23,17 @@ public AlgoVisualizer(int sceneWidth, int sceneHeight, int N, ThreeWaysQuickSort
         });
     }
 
+    public AlgoVisualizer(int sceneWidth, int sceneHeight, int N){
+        this(sceneWidth, sceneHeight, N, ThreeWaysQuickSortData.Type.Default);
+    }
+
     public void run(){
 
         setData(-1, -1, -1, -1, -1, -1);
 
         quickSort3Ways(0, data.N()-1);
 
-        setData(0, data.N()-1, -1, -1, -1, -1);
+        setData(-1, -1, -1, -1, -1, -1);
     }
 
     private void quickSort3Ways(int l, int r){
@@ -47,9 +50,11 @@ private void quickSort3Ways(int l, int r){
 
         // 随机在arr[l...r]的范围中, 选择一个数值作为标定点pivot
         int p = (int)(Math.random()*(r-l+1)) + l;
-        data.swap(l, p);
+        setData(l, r, -1, p, -1, -1);
 
+        data.swap(l, p);
         int v = data.get(l);
+        setData(l, r, -1, l, -1, -1);
 
         int lt = l;     // arr[l+1...lt] < v
         int gt = r + 1; // arr[gt...r] > v

04-Sort-Visualization/10-Three-Ways-Quick-Sort-Visualization/src/ThreeWaysQuickSortData.java

@@ -22,8 +22,11 @@ public ThreeWaysQuickSortData(int N, int randomBound, Type dataType){
 
         int lBound = 1;
         int rBound = randomBound;
-        if(dataType == Type.Identical)
-            lBound = rBound;
+        if(dataType == Type.Identical){
+            int avgNumber = (lBound + rBound) / 2;
+            lBound = avgNumber;
+            rBound = avgNumber;
+        }
 
         for( int i = 0 ; i < N ; i ++) {
             numbers[i] = (int)(Math.random()*(rBound-lBound+1)) + lBound;