Merge pull request TheAlgorithms#681 from guoxiaoxu/master

yanglbme · web-flow · commit 8677246af7ec · 2019-01-13T16:42:52.000+08:00
Update MergeSort.java
diff --git a/Sorts/MergeSort.java b/Sorts/MergeSort.java
@@ -70,26 +70,19 @@ private static <T extends Comparable<T>> void merge(T[] arr, T[] temp, int left,
 
         while (i <= mid && j <= right) {
             if (temp[i].compareTo(temp[j]) <= 0) {
-                arr[k] = temp[i];
-                i++;
+                arr[k++] = temp[i++];
             }
             else {
-                arr[k] = temp[j];
-                j++;
+                arr[k++] = temp[j++];
             }
-            k++;
         }
 
         while (i <= mid) {
-            arr[k] = temp[i];
-            i++;
-            k++;
+            arr[k++] = temp[i++];
         }
 
 	while (j <= right) {
-	    arr[k] = temp[j];
-	    j++;
-	    k++;
+	    arr[k++] = temp[j++];
 	}
     }
 

Original file line number	Diff line number	Diff line change
`@@ -70,26 +70,19 @@ private static <T extends Comparable<T>> void merge(T[] arr, T[] temp, int left,`
`70`	`70`
`71`	`71`	`while (i <= mid && j <= right) {`
`72`	`72`	`if (temp[i].compareTo(temp[j]) <= 0) {`
`73`		`- arr[k] = temp[i];`
`74`		`- i++;`
	`73`	`+ arr[k++] = temp[i++];`
`75`	`74`	`}`
`76`	`75`	`else {`
`77`		`- arr[k] = temp[j];`
`78`		`- j++;`
	`76`	`+ arr[k++] = temp[j++];`
`79`	`77`	`}`
`80`		`- k++;`
`81`	`78`	`}`
`82`	`79`
`83`	`80`	`while (i <= mid) {`
`84`		`- arr[k] = temp[i];`
`85`		`- i++;`
`86`		`- k++;`
	`81`	`+ arr[k++] = temp[i++];`
`87`	`82`	`}`
`88`	`83`
`89`	`84`	`while (j <= right) {`
`90`		`- arr[k] = temp[j];`
`91`		`- j++;`
`92`		`- k++;`
	`85`	`+ arr[k++] = temp[j++];`
`93`	`86`	`}`
`94`	`87`	`}`
`95`	`88`