rewrite quickSort

Juntaran · Juntaran · commit f2917b75b943 · 2018-12-08T16:32:50.000+08:00
diff --git a/Algorithm/Sort/Quick_Sort/main/main.go b/Algorithm/Sort/Quick_Sort/main/main.go
@@ -13,7 +13,7 @@ import (
 
 func main() {
 	testArray := []int{4, 2, 6, 7, 9, 5, 1, 3}
-	//Quick_Sort.Quick_Sort_Recurse(testArray)
-	Quick_Sort.Quick_Sort_Unrecurse(testArray)
+	Quick_Sort.Quick_Sort_Recurse(testArray)
+	//Quick_Sort.Quick_Sort_Unrecurse(testArray)
 	fmt.Println(testArray)
 }
diff --git a/Algorithm/Sort/Quick_Sort/quick_sort_recurse.go b/Algorithm/Sort/Quick_Sort/quick_sort_recurse.go
@@ -6,33 +6,34 @@
 
 package Quick_Sort
 
-func Quick_Sort_Recurse(nums []int)  {
-	left  := 0
-	right := len(nums) - 1
-	sort(nums, left, right)
+func Quick_Sort_Recurse(nums []int) {
+	quickSort(nums, 0, len(nums)-1)
 }
 
-func sort(nums []int, left int, right int)  {
+func quickSort(nums []int, left, right int) {
 	if left < right {
-		i := left
-		j := right
+		i, j := left, right
 		flag := nums[left]
-
+		// 从右向左找第一个比 flag 小的数
 		for i < j {
-			// 从右向左找第一个比基数小的元素
-			for i < j && nums[j] >= flag {
+			if nums[j] >= flag {
 				j --
+			} else {
+				break
 			}
-			nums[i] = nums[j]
-
-			// 从左向右找第一个比基数大的元素
-			for i < j && nums[i] < flag {
+		}
+		nums[i] = nums[j]
+		// 从左向右找第一个比 flag 大的数
+		for i < j {
+			if nums[i] < flag {
 				i ++
+			} else {
+				break
 			}
-			nums[j] = nums[i]
 		}
+		nums[j] = nums[i]
 		nums[i] = flag
-		sort(nums, left, i-1)
-		sort(nums, i+1,  right)
+		quickSort(nums, left, i-1)
+		quickSort(nums, i+1, right)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`
`14`	`14`	`func main() {`
`15`	`15`	`testArray := []int{4, 2, 6, 7, 9, 5, 1, 3}`
`16`		`- //Quick_Sort.Quick_Sort_Recurse(testArray)`
`17`		`- Quick_Sort.Quick_Sort_Unrecurse(testArray)`
	`16`	`+ Quick_Sort.Quick_Sort_Recurse(testArray)`
	`17`	`+ //Quick_Sort.Quick_Sort_Unrecurse(testArray)`
`18`	`18`	`fmt.Println(testArray)`
`19`	`19`	`}`