Chapter 04 codes updated.

Author: liuyubobobo

04-Sort-Visualization/06-Merge-Sort-Visualization/01-Merge-Sort-TD-Visualization/src/AlgoVisualizer.java

@@ -29,7 +29,7 @@ public void run(){
 
         mergeSort(0, data.N()-1);
 
-        this.setData(0, data.N()-1, data.N());
+        setData(0, data.N()-1, data.N()-1);
     }
 
     private void mergeSort(int l, int r){

04-Sort-Visualization/06-Merge-Sort-Visualization/01-Merge-Sort-TD-Visualization/src/MergeSortData.java

@@ -4,7 +4,7 @@
 
 public class MergeSortData {
 
-    private int[] numbers;
+    public int[] numbers;
     public int l, r;
     public int mergeIndex;
 

04-Sort-Visualization/06-Merge-Sort-Visualization/02-Merge-Sort-BU-Visualization/src/AlgoVisualizer.java

@@ -32,7 +32,7 @@ public void run(){
                 // 对 arr[i...i+sz-1] 和 arr[i+sz...i+2*sz-1] 进行归并
                 merge(i, i+sz-1, Math.min(i+sz+sz-1,data.N()-1));
 
-        this.setData(0, data.N()-1, data.N());
+        this.setData(0, data.N()-1, data.N()-1);
     }
 
     private void merge(int l, int mid, int r){

04-Sort-Visualization/06-Merge-Sort-Visualization/02-Merge-Sort-BU-Visualization/src/MergeSortData.java

@@ -4,7 +4,7 @@
 
 public class MergeSortData {
 
-    private int[] numbers;
+    public int[] numbers;
     public int l, r;
     public int mergeIndex;
 

04-Sort-Visualization/07-Quick-Sort-Visualization/src/AlgoFrame.java

@@ -65,7 +65,6 @@ public void paintComponent(Graphics g) {
 
             // 具体绘制
             int w = canvasWidth/data.N();
-            //AlgoVisHelper.setColor(g2d, AlgoVisHelper.Grey);
             for(int i = 0 ; i < data.N() ; i ++ ) {
                 if ( i >= data.l && i <= data.r)
                     AlgoVisHelper.setColor(g2d, AlgoVisHelper.Green);

04-Sort-Visualization/07-Quick-Sort-Visualization/src/AlgoVisualizer.java

@@ -7,10 +7,10 @@ public class AlgoVisualizer {
     private QuickSortData data;
     private AlgoFrame frame;
 
-    public AlgoVisualizer(int sceneWidth, int sceneHeight, int N, QuickSortData.Type dataType){
+    public AlgoVisualizer(int sceneWidth, int sceneHeight, int N){
 
         // 初始化数据
-        data = new QuickSortData(N, sceneHeight, dataType);
+        data = new QuickSortData(N, sceneHeight);
 
         // 初始化视图
         EventQueue.invokeLater(() -> {
@@ -90,7 +90,7 @@ public static void main(String[] args) {
         int sceneHeight = 800;
         int N = 100;
 
-        AlgoVisualizer vis = new AlgoVisualizer(sceneWidth, sceneHeight, N, QuickSortData.Type.Default);
+        AlgoVisualizer vis = new AlgoVisualizer(sceneWidth, sceneHeight, N);
 
     }
 }

04-Sort-Visualization/07-Quick-Sort-Visualization/src/QuickSortData.java

@@ -4,19 +4,13 @@
 
 public class QuickSortData {
 
-    public enum Type{
-        Default,
-        NearlyOrdered
-    }
-
-    public int[] numbers;
+    private int[] numbers;
     public int l, r;
     public boolean[] fixedPivots;
     public int curPivot;
     public int curElement;
 
-    // 生成N个[0,randomBound)之间的随机数；nearlyOrdered控制随机数是否近乎有序
-    public QuickSortData(int N, int randomBound, Type dataType){
+    public QuickSortData(int N, int randomBound){
 
         numbers = new int[N];
         fixedPivots = new boolean[N];
@@ -26,15 +20,6 @@ public QuickSortData(int N, int randomBound, Type dataType){
             fixedPivots[i] = false;
         }
 
-        if(dataType == Type.NearlyOrdered){
-            Arrays.sort(numbers);
-            int swapTime = (int)(0.02*N);
-            for(int i = 0 ; i < swapTime; i ++){
-                int a = (int)(Math.random()*N);
-                int b = (int)(Math.random()*N);
-                swap(a, b);
-            }
-        }
     }
 
     public int N(){

04-Sort-Visualization/08-Quick-Sort-Visualization-with-Random-Pivot/src/QuickSortData.java

@@ -1,5 +1,4 @@
 import java.util.Arrays;
-import java.util.Random;
 
 
 public class QuickSortData {
@@ -9,13 +8,12 @@ public enum Type{
         NearlyOrdered
     }
 
-    public int[] numbers;
+    private int[] numbers;
     public int l, r;
     public boolean[] fixedPivots;
     public int curPivot;
     public int curElement;
 
-    // 生成N个[0,randomBound)之间的随机数；nearlyOrdered控制随机数是否近乎有序
     public QuickSortData(int N, int randomBound, Type dataType){
 
         numbers = new int[N];
@@ -28,7 +26,7 @@ public QuickSortData(int N, int randomBound, Type dataType){
 
         if(dataType == Type.NearlyOrdered){
             Arrays.sort(numbers);
-            int swapTime = (int)(0.02*N);
+            int swapTime = (int)(0.01*N);
             for(int i = 0 ; i < swapTime; i ++){
                 int a = (int)(Math.random()*N);
                 int b = (int)(Math.random()*N);
@@ -37,6 +35,10 @@ public QuickSortData(int N, int randomBound, Type dataType){
         }
     }
 
+    public QuickSortData(int N, int randomBound){
+        this(N, randomBound, Type.Default);
+    }
+
     public int N(){
         return numbers.length;
     }

04-Sort-Visualization/09-Two-Ways-Quick-Sort-Visualization/01-Quick-Sort-Visualization-with-Almost-Identical-Items-Problem/src/AlgoFrame.java

@@ -10,7 +10,6 @@ public class AlgoFrame extends JFrame{
 
     private int canvasWidth;
     private int canvasHeight;
-    private JPanel canvas;
 
     public AlgoFrame(String title, int canvasWidth, int canvasHeight){
 
@@ -39,7 +38,7 @@ public AlgoFrame(String title){
 
     // data
     QuickSortData data;
-    public void setData(QuickSortData data){
+    public void render(QuickSortData data){
         this.data = data;
         repaint();
     }
@@ -68,14 +67,14 @@ public void paintComponent(Graphics g) {
             int w = canvasWidth/data.N();
             //AlgoVisHelper.setColor(g2d, AlgoVisHelper.Grey);
             for(int i = 0 ; i < data.N() ; i ++ ) {
-                if ( data.l != -1 && data.r != -1 && i >= data.l && i <= data.r)
+                if ( i >= data.l && i <= data.r)
                     AlgoVisHelper.setColor(g2d, AlgoVisHelper.Green);
                 else
                     AlgoVisHelper.setColor(g2d, AlgoVisHelper.Grey);
 
-                if( data.curPivot != -1 && i == data.curPivot )
+                if( i == data.curPivot )
                     AlgoVisHelper.setColor(g2d, AlgoVisHelper.Indigo);
-                if( data.curElement != -1 && i == data.curElement)
+                if( i == data.curElement)
                     AlgoVisHelper.setColor(g2d, AlgoVisHelper.LightBlue);
                 if( data.fixedPivots[i] )
                     AlgoVisHelper.setColor(g2d, AlgoVisHelper.Red);

04-Sort-Visualization/09-Two-Ways-Quick-Sort-Visualization/01-Quick-Sort-Visualization-with-Almost-Identical-Items-Problem/src/AlgoVisHelper.java

@@ -4,7 +4,6 @@
 import java.awt.geom.Rectangle2D;
 import java.lang.InterruptedException;
 
-
 public class AlgoVisHelper {
 
     private AlgoVisHelper(){}
@@ -31,36 +30,35 @@ private AlgoVisHelper(){}
     public static final Color Black = new Color(0x000000);
     public static final Color White = new Color(0xFFFFFF);
 
-
-    static public void strokeCircle(Graphics2D g, int x, int y, int r){
+    public static void strokeCircle(Graphics2D g, int x, int y, int r){
 
         Ellipse2D circle = new Ellipse2D.Double(x-r, y-r, 2*r, 2*r);
         g.draw(circle);
     }
 
-    static public void fillCircle(Graphics2D g, int x, int y, int r){
+    public static void fillCircle(Graphics2D g, int x, int y, int r){
 
         Ellipse2D circle = new Ellipse2D.Double(x-r, y-r, 2*r, 2*r);
         g.fill(circle);
     }
 
-    static public void strokeRectangle(Graphics2D g, int x, int y, int w, int h){
+    public static void strokeRectangle(Graphics2D g, int x, int y, int w, int h){
 
         Rectangle2D rectangle = new Rectangle2D.Double(x, y, w, h);
         g.draw(rectangle);
     }
 
-    static public void fillRectangle(Graphics2D g, int x, int y, int w, int h){
+    public static void fillRectangle(Graphics2D g, int x, int y, int w, int h){
 
         Rectangle2D rectangle = new Rectangle2D.Double(x, y, w, h);
         g.fill(rectangle);
     }
 
-    static public void setColor(Graphics2D g, Color color){
+    public static void setColor(Graphics2D g, Color color){
         g.setColor(color);
     }
 
-    static public void setStrokeWidth(Graphics2D g, int w){
+    public static void setStrokeWidth(Graphics2D g, int w){
         int strokeWidth = w;
         g.setStroke(new BasicStroke(strokeWidth, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
     }