-
Notifications
You must be signed in to change notification settings - Fork 15
[QuickSort] clean the left param +1/-1, beautify judgment conditions #9
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
PhzCode
wants to merge
1
commit into
jonhoo:master
Choose a base branch
from
PhzCode:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,41 +17,32 @@ fn quicksort<T: Ord>(slice: &mut [T]) { | |
| let (pivot, rest) = slice.split_first_mut().expect("slice is non-empty"); | ||
| let mut left = 0; | ||
| let mut right = rest.len() - 1; | ||
| while left <= right { | ||
| // if right <= 0, it's done | ||
| while left <= right && right > 0 { | ||
| if &rest[left] <= pivot { | ||
| // already on the correct side | ||
| left += 1; | ||
| } else if &rest[right] > pivot { | ||
| } else if &rest[right] > pivot && right > 0 { | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think this conditional change is necessary? After all, we won't get here with the new |
||
| // right already on the correct side | ||
| // avoid unnecessary swaps back and forth | ||
| if right == 0 { | ||
| // we must be done | ||
| break; | ||
| } | ||
| right -= 1; | ||
| } else { | ||
| // left holds a right, and right holds a left, swap them. | ||
| rest.swap(left, right); | ||
| left += 1; | ||
| if right == 0 { | ||
| // we must be done | ||
| break; | ||
| } | ||
| right -= 1; | ||
| } | ||
| } | ||
|
|
||
| // re-align left to account for the pivot at 0 | ||
| let left = left + 1; | ||
|
|
||
| // place the pivot at its final location | ||
| slice.swap(0, left - 1); | ||
|
|
||
| // split_at_mut(mid: usize) -> (&mut [..mid), &mut [mid..]) | ||
| let (left, right) = slice.split_at_mut(left - 1); | ||
| assert!(left.last() <= right.first()); | ||
| quicksort(left); | ||
| quicksort(&mut right[1..]); | ||
| slice.swap(0, left); | ||
|
|
||
| // left is the pivot index | ||
| // less_pivot = [0, left) greater_pivot = (left, slice.len() - 1] | ||
| let (less_pivot, greater_pivot) = slice.split_at_mut(left); | ||
| assert!(less_pivot.last() <= greater_pivot.first()); | ||
| quicksort(less_pivot); | ||
| quicksort(&mut greater_pivot[1..]); | ||
| } | ||
|
|
||
| impl<T> Sorter<T> for QuickSort { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe also point out here (this helped me) that if
right <= 0, thenleft == right, so there can't be a need to swap.