👌 针对排序算法代码做简单优化

dunwu · dunwu · commit e6d94f77a882 · 2017-11-21T13:52:40.000+08:00
diff --git a/codes/src/main/java/io/github/dunwu/algorithm/sort/strategy/HeapSort.java b/codes/src/main/java/io/github/dunwu/algorithm/sort/strategy/HeapSort.java
@@ -8,7 +8,7 @@
  * @author Zhang Peng
  */
 public class HeapSort implements Sort {
-    private static void heapadjust(int[] array, int parent, int length) {
+    private static void adjustHeat(int[] array, int parent, int length) {
         // temp保存当前父节点
         int temp = array[parent];
         // 先获得左孩子
@@ -40,7 +40,7 @@ private static void heapadjust(int[] array, int parent, int length) {
     public void sort(int[] list) {
         // 循环建立初始堆
         for (int i = list.length / 2; i >= 0; i--) {
-            heapadjust(list, i, list.length);
+            adjustHeat(list, i, list.length);
         }
 
         // 进行n-1次循环，完成排序
@@ -51,7 +51,7 @@ public void sort(int[] list) {
             list[0] = temp;
 
             // 筛选 R[0] 结点，得到i-1个结点的堆
-            heapadjust(list, 0, i);
+            adjustHeat(list, 0, i);
 
             ArrayUtil.debugLogArray(list, 0, list.length - 1, String.format("第 %d 趟：", list.length - i));
         }
diff --git a/codes/src/main/java/io/github/dunwu/algorithm/sort/strategy/MergeSort.java b/codes/src/main/java/io/github/dunwu/algorithm/sort/strategy/MergeSort.java
@@ -48,7 +48,7 @@ private void merge(int[] array, int low, int mid, int high) {
         }
     }
 
-    private void mergepass(int[] array, int gap, int length) {
+    private void mergeSort(int[] array, int gap, int length) {
         int i = 0;
 
         // 归并gap长度的两个相邻子表
@@ -65,7 +65,7 @@ private void mergepass(int[] array, int gap, int length) {
     @Override
     public void sort(int[] list) {
         for (int gap = 1; gap < list.length; gap = 2 * gap) {
-            mergepass(list, gap, list.length);
+            mergeSort(list, gap, list.length);
             ArrayUtil.debugLogArray(list, 0, list.length - 1, String.format("gap = %d", gap));
         }
     }
diff --git a/codes/src/test/java/io/github/dunwu/algorithm/sort/SortStrategyTest.java b/codes/src/test/java/io/github/dunwu/algorithm/sort/SortStrategyTest.java
@@ -21,6 +21,9 @@
 
 /**
  * 排序算法单元测试
+ * 如果需要打印每趟排序的结果，可以修改 logback.xml 中
+ * <logger name="io.github.dunwu" level="INFO" additivity="false"> 的 level 级别，改为 DEBUG，
+ * 日志就会打印 debug 信息。
  * @author Zhang Peng
  */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ private void merge(int[] array, int low, int mid, int high) {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- private void mergepass(int[] array, int gap, int length) {`
	`51`	`+ private void mergeSort(int[] array, int gap, int length) {`
`52`	`52`	`int i = 0;`
`53`	`53`
`54`	`54`	`// 归并gap长度的两个相邻子表`
`@@ -65,7 +65,7 @@ private void mergepass(int[] array, int gap, int length) {`
`65`	`65`	`@Override`
`66`	`66`	`public void sort(int[] list) {`
`67`	`67`	`for (int gap = 1; gap < list.length; gap = 2 * gap) {`
`68`		`- mergepass(list, gap, list.length);`
	`68`	`+ mergeSort(list, gap, list.length);`
`69`	`69`	`ArrayUtil.debugLogArray(list, 0, list.length - 1, String.format("gap = %d", gap));`
`70`	`70`	`}`
`71`	`71`	`}`